Skip to content

Commit 2b59250

Browse files
Pull request project-chip#1770: MATTER-3469: Cherry-pick : CSA:Temp fix for project-chip#32875 (network commissioning cluster check for SSID on Thread feature) (project-chip#32884)
Merge in WMN_TOOLS/matter from cherry-pick/remove_no_ssid_check to RC_2.3.0-1.3 Squashed commit of the following: commit 29c1eb165d6e322bb106ef200950c57485118b52 Author: chrisdecenzo <61757564+chrisdecenzo@users.noreply.github.com> Date: Tue Apr 9 08:27:01 2024 -0700 Temp fix for project-chip#32875 (network commissioning cluster check for SSID on Thread feature) (project-chip#32884) * Temp fix for 32875 * Clarify comments
1 parent ecc4635 commit 2b59250

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

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

+10-5
Original file line numberDiff line numberDiff line change
@@ -491,12 +491,17 @@ 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+
//
494499
// SSID present on Thread violates the `[WI]` conformance.
495-
if (req.ssid.HasValue())
496-
{
497-
ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand);
498-
return;
499-
}
500+
// if (req.ssid.HasValue())
501+
// {
502+
// ctx.mCommandHandler.AddStatus(ctx.mRequestPath, Protocols::InteractionModel::Status::InvalidCommand);
503+
// return;
504+
// }
500505

501506
mCurrentOperationBreadcrumb = req.breadcrumb;
502507
mAsyncCommandHandle = CommandHandler::Handle(&ctx.mCommandHandler);

0 commit comments

Comments
 (0)