From a2ebe3c3c65669c8189c72e8b51e7fa81862c135 Mon Sep 17 00:00:00 2001 From: chrisdecenzo Date: Sat, 6 Apr 2024 06:48:45 -0700 Subject: [PATCH 1/2] Temp fix for 32875 --- .../network-commissioning/network-commissioning.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/clusters/network-commissioning/network-commissioning.cpp b/src/app/clusters/network-commissioning/network-commissioning.cpp index 8212ea9f8008dc..0691e02d65ccad 100644 --- a/src/app/clusters/network-commissioning/network-commissioning.cpp +++ b/src/app/clusters/network-commissioning/network-commissioning.cpp @@ -492,11 +492,11 @@ void Instance::HandleScanNetworks(HandlerContext & ctx, const Commands::ScanNetw else if (mFeatureFlags.Has(Feature::kThreadNetworkInterface)) { // 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); From cbac1d75d196a51ab1cba504dbea1234eda0de5a Mon Sep 17 00:00:00 2001 From: chrisdecenzo Date: Sun, 7 Apr 2024 19:42:32 -0700 Subject: [PATCH 2/2] Clarify comments --- .../clusters/network-commissioning/network-commissioning.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/app/clusters/network-commissioning/network-commissioning.cpp b/src/app/clusters/network-commissioning/network-commissioning.cpp index 0691e02d65ccad..3ad47b6cee7540 100644 --- a/src/app/clusters/network-commissioning/network-commissioning.cpp +++ b/src/app/clusters/network-commissioning/network-commissioning.cpp @@ -491,6 +491,11 @@ 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()) // {