Skip to content

Commit

Permalink
Pull request project-chip#1770: MATTER-3469: Cherry-pick : CSA:Temp f…
Browse files Browse the repository at this point in the history
…ix 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 <[email protected]>
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
  • Loading branch information
jmartinez-silabs committed Apr 17, 2024
1 parent ecc4635 commit 2b59250
Showing 1 changed file with 10 additions and 5 deletions.
15 changes: 10 additions & 5 deletions src/app/clusters/network-commissioning/network-commissioning.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -491,12 +491,17 @@ 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);
Expand Down

0 comments on commit 2b59250

Please sign in to comment.