Revert "Temp fix for project-chip#32875 (network commissioning cluste…

…r check for SSID on Thread feature) (project-chip#32884) (project-chip#33032)" This reverts commit 64c07c6. Signed-off-by: Adrian Gielniewski <[email protected]>
maciejbaczmanski · Nov 28, 2024 · 524065a · 524065a
1 parent 1ea6591
commit 524065a
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/src/app/clusters/network-commissioning/network-commissioning.cpp b/src/app/clusters/network-commissioning/network-commissioning.cpp
@@ -491,17 +491,12 @@ void Instance::HandleScanNetworks(HandlerContext & ctx, const Commands::ScanNetw
     }
     else if (mFeatureFlags.Has(Feature::kThreadNetworkInterface))
     {
-        // NOTE: the following lines were commented out due to issue #32875. In short, a popular
-        // commissioner is passing a null SSID argument and this logic breaks interoperability as a result.
-        // The spec has some inconsistency on this which also needs to be fixed. The commissioner maker is
-        // fixing its code and will return to un-comment this code, with that work tracked by Issue #32887.
-        //
         // SSID present on Thread violates the `[WI]` conformance.
-        // if (req.ssid.HasValue())
-        // {
-        //     ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand);
-        //     return;
-        // }
+        if (req.ssid.HasValue())
+        {
+            ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand);
+            return;
+        }
 
         mCurrentOperationBreadcrumb = req.breadcrumb;
         mAsyncCommandHandle         = CommandHandler::Handle(&ctx.mCommandHandler);