3838#include " platform/CHIPDeviceEvent.h"
3939#include " platform/PlatformManager.h"
4040#include " protocols/interaction_model/StatusCode.h"
41+ #include < optional>
4142
4243namespace chip {
4344namespace app {
@@ -46,21 +47,24 @@ namespace ThreadBorderRouterManagement {
4647
4748using Protocols::InteractionModel::Status;
4849
49- static bool IsCommandOverCASESession (CommandHandlerInterface::HandlerContext & ctx)
50+ bool ServerInstance:: IsCommandOverCASESession
5051{
52+ #if CONFIG_BUILD_FOR_HOST_UNIT_TEST
53+ if (mSkipCASESessionCheck )
54+ {
55+ return true ;
56+ }
57+ #endif // CONFIG_BUILD_FOR_HOST_UNIT_TEST
5158 Messaging::ExchangeContext * exchangeCtx = ctx.mCommandHandler .GetExchangeContext ();
5259 return exchangeCtx && exchangeCtx->HasSessionHandle () && exchangeCtx->GetSessionHandle ()->IsSecureSession () &&
5360 exchangeCtx->GetSessionHandle ()->AsSecureSession ()->GetSecureSessionType () == Transport::SecureSession::Type::kCASE ;
5461}
5562
56- Status ServerInstance::HandleGetDatasetRequest (bool isOverCASESession , Delegate::DatasetType type,
63+ Status ServerInstance::HandleGetDatasetRequest (CommandHandlerInterface::HandlerContext & ctx , Delegate::DatasetType type,
5764 Thread::OperationalDataset & dataset)
5865{
5966 VerifyOrDie (mDelegate );
60- if (!isOverCASESession)
61- {
62- return Status::UnsupportedAccess;
63- }
67+ VerifyOrReturnValue (IsCommandOverCASESession (ctx), Status::UnsupportedAccess);
6468
6569 CHIP_ERROR err = mDelegate ->GetDataset (dataset, type);
6670 if (err != CHIP_NO_ERROR)
@@ -70,7 +74,7 @@ Status ServerInstance::HandleGetDatasetRequest(bool isOverCASESession, Delegate:
7074 return Status::Success;
7175}
7276
73- Status ServerInstance::HandleSetActiveDatasetRequest (CommandHandler * commandHandler ,
77+ Status ServerInstance::HandleSetActiveDatasetRequest (CommandHandlerInterface::HandlerContext & ctx ,
7478 const Commands::SetActiveDatasetRequest::DecodableType & req)
7579{
7680 // The SetActiveDatasetRequest command SHALL be FailSafeArmed. Upon receiving this command, the Thread BR will set its
@@ -80,7 +84,8 @@ Status ServerInstance::HandleSetActiveDatasetRequest(CommandHandler * commandHan
8084 // reverted. If the FailSafe timer expires before the Thread BR responds, the Thread BR will respond with a timeout status and
8185 // the active dataset should also be reverted.
8286 VerifyOrDie (mDelegate );
83- VerifyOrReturnValue (mFailsafeContext .IsFailSafeArmed (commandHandler->GetAccessingFabricIndex ()), Status::FailsafeRequired);
87+ VerifyOrReturnValue (IsCommandOverCASESession (ctx), Status::UnsupportedAccess);
88+ VerifyOrReturnValue (mFailsafeContext .IsFailSafeArmed (ctx.mCommandHandler .GetAccessingFabricIndex ()), Status::FailsafeRequired);
8489
8590 Thread::OperationalDataset activeDataset;
8691 Thread::OperationalDataset currentActiveDataset;
@@ -101,17 +106,19 @@ Status ServerInstance::HandleSetActiveDatasetRequest(CommandHandler * commandHan
101106 {
102107 return Status::Busy;
103108 }
104- commandHandler-> FlushAcksRightAwayOnSlowCommand ();
105- mAsyncCommandHandle = CommandHandler::Handle (commandHandler );
109+ ctx. mCommandHandler . FlushAcksRightAwayOnSlowCommand ();
110+ mAsyncCommandHandle = CommandHandler::Handle (&ctx. mCommandHandler );
106111 mBreadcrumb = req.breadcrumb ;
107112 mSetActiveDatasetSequenceNumber ++;
108113 mDelegate ->SetActiveDataset (activeDataset, mSetActiveDatasetSequenceNumber , this );
109114 return Status::Success;
110115}
111116
112- Status ServerInstance::HandleSetPendingDatasetRequest (const Commands::SetPendingDatasetRequest::DecodableType & req)
117+ Status ServerInstance::HandleSetPendingDatasetRequest (CommandHandlerInterface::HandlerContext & ctx,
118+ const Commands::SetPendingDatasetRequest::DecodableType & req)
113119{
114120 VerifyOrDie (mDelegate );
121+ VerifyOrReturnValue (IsCommandOverCASESession (ctx), Status::UnsupportedAccess);
115122 if (!mDelegate ->GetPanChangeSupported ())
116123 {
117124 return Status::UnsupportedCommand;
@@ -143,21 +150,21 @@ void ServerInstance::InvokeCommand(HandlerContext & ctxt)
143150 case Commands::GetActiveDatasetRequest::Id:
144151 HandleCommand<Commands::GetActiveDatasetRequest::DecodableType>(ctxt, [this ](HandlerContext & ctx, const auto & req) {
145152 Thread::OperationalDataset dataset;
146- Status status = HandleGetActiveDatasetRequest (IsCommandOverCASESession ( ctx) , dataset);
153+ Status status = HandleGetActiveDatasetRequest (ctx, dataset);
147154 AddDatasetResponse (ctx, status, dataset);
148155 });
149156 break ;
150157 case Commands::GetPendingDatasetRequest::Id:
151158 HandleCommand<Commands::GetPendingDatasetRequest::DecodableType>(ctxt, [this ](HandlerContext & ctx, const auto & req) {
152159 Thread::OperationalDataset dataset;
153- Status status = HandleGetPendingDatasetRequest (IsCommandOverCASESession ( ctx) , dataset);
160+ Status status = HandleGetPendingDatasetRequest (ctx, dataset);
154161 AddDatasetResponse (ctx, status, dataset);
155162 });
156163 break ;
157164 case Commands::SetActiveDatasetRequest::Id:
158165 HandleCommand<Commands::SetActiveDatasetRequest::DecodableType>(ctxt, [this ](HandlerContext & ctx, const auto & req) {
159166 mPath = ctx.mRequestPath ;
160- Status status = HandleSetActiveDatasetRequest (& ctx. mCommandHandler , req);
167+ Status status = HandleSetActiveDatasetRequest (ctx, req);
161168 if (status != Status::Success)
162169 {
163170 // If status is not Success, we should immediately report the status. Otherwise the async work will report the
@@ -168,7 +175,8 @@ void ServerInstance::InvokeCommand(HandlerContext & ctxt)
168175 break ;
169176 case Commands::SetPendingDatasetRequest::Id:
170177 HandleCommand<Commands::SetPendingDatasetRequest::DecodableType>(ctxt, [this ](HandlerContext & ctx, const auto & req) {
171- ctx.mCommandHandler .AddStatus (ctx.mRequestPath , HandleSetPendingDatasetRequest (req));
178+ Status status = HandleSetPendingDatasetRequest (ctx, req);
179+ ctx.mCommandHandler .AddStatus (ctx.mRequestPath , status);
172180 });
173181 break ;
174182 default :
@@ -199,16 +207,28 @@ CHIP_ERROR ServerInstance::ReadBorderAgentID(MutableByteSpan & outBorderAgentId)
199207 return CHIP_NO_ERROR;
200208}
201209
202- Optional <uint64_t > ServerInstance::ReadActiveDatasetTimestamp ()
210+ std::optional <uint64_t > ServerInstance::ReadActiveDatasetTimestamp ()
203211{
204212 uint64_t activeDatasetTimestampValue = 0 ;
205213 Thread::OperationalDataset activeDataset;
206214 if ((mDelegate ->GetDataset (activeDataset, Delegate::DatasetType::kActive ) == CHIP_NO_ERROR) &&
207215 (activeDataset.GetActiveTimestamp (activeDatasetTimestampValue) == CHIP_NO_ERROR))
208216 {
209- return MakeOptional (activeDatasetTimestampValue);
217+ return std::make_optional (activeDatasetTimestampValue);
218+ }
219+ return std::nullopt;
220+ }
221+
222+ std::optional<uint64_t > ServerInstance::ReadPendingDatasetTimestamp ()
223+ {
224+ uint64_t pendingDatasetTimestampValue = 0 ;
225+ Thread::OperationalDataset pendingDataset;
226+ if ((mDelegate ->GetDataset (pendingDataset, Delegate::DatasetType::kPending ) == CHIP_NO_ERROR) &&
227+ (pendingDataset.GetActiveTimestamp (pendingDatasetTimestampValue) == CHIP_NO_ERROR))
228+ {
229+ return std::make_optional (pendingDatasetTimestampValue);
210230 }
211- return NullOptional ;
231+ return std::nullopt ;
212232}
213233
214234CHIP_ERROR ServerInstance::Read (const ConcreteReadAttributePath & aPath, AttributeValueEncoder & aEncoder)
@@ -259,9 +279,13 @@ CHIP_ERROR ServerInstance::Read(const ConcreteReadAttributePath & aPath, Attribu
259279 break ;
260280 }
261281 case Attributes::ActiveDatasetTimestamp::Id: {
262- Optional<uint64_t > activeDatasetTimestamp = ReadActiveDatasetTimestamp ();
263- status = activeDatasetTimestamp.HasValue () ? aEncoder.Encode (DataModel::MakeNullable (activeDatasetTimestamp.Value ()))
264- : aEncoder.EncodeNull ();
282+ std::optional<uint64_t > activeDatasetTimestamp = ReadActiveDatasetTimestamp ();
283+ status = activeDatasetTimestamp.has_value () ? aEncoder.Encode (activeDatasetTimestamp.value ()) : aEncoder.EncodeNull ();
284+ break ;
285+ }
286+ case Attributes::PendingDatasetTimestamp::Id: {
287+ std::optional<uint64_t > pendingDatasetTimestamp = ReadPendingDatasetTimestamp ();
288+ status = pendingDatasetTimestamp.has_value () ? aEncoder.Encode (pendingDatasetTimestamp.value ()) : aEncoder.EncodeNull ();
265289 break ;
266290 }
267291 default :
0 commit comments