Skip to content

Commit 524065a

Browse files
committed
Revert "Temp fix for project-chip#32875 (network commissioning cluster check for SSID on Thread feature) (project-chip#32884) (project-chip#33032)"
This reverts commit 64c07c6. Signed-off-by: Adrian Gielniewski <adrian.gielniewski@nordicsemi.no>
1 parent 1ea6591 commit 524065a

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

src/app/clusters/network-commissioning/network-commissioning.cpp

+5-10
Original file line numberDiff line numberDiff line change
@@ -491,17 +491,12 @@ void Instance::HandleScanNetworks(HandlerContext & ctx, const Commands::ScanNetw
491491
}
492492
else if (mFeatureFlags.Has(Feature::kThreadNetworkInterface))
493493
{
494-
// NOTE: the following lines were commented out due to issue #32875. In short, a popular
495-
// commissioner is passing a null SSID argument and this logic breaks interoperability as a result.
496-
// The spec has some inconsistency on this which also needs to be fixed. The commissioner maker is
497-
// fixing its code and will return to un-comment this code, with that work tracked by Issue #32887.
498-
//
499494
// SSID present on Thread violates the `[WI]` conformance.
500-
// if (req.ssid.HasValue())
501-
// {
502-
// ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand);
503-
// return;
504-
// }
495+
if (req.ssid.HasValue())
496+
{
497+
ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand);
498+
return;
499+
}
505500

506501
mCurrentOperationBreadcrumb = req.breadcrumb;
507502
mAsyncCommandHandle = CommandHandler::Handle(&ctx.mCommandHandler);

0 commit comments

Comments
 (0)