Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Temp fix for #32875 (network commissioning cluster check for SSID on Thread feature) #32884

Merged
merged 2 commits into from
Apr 9, 2024
+10 −5
Merged

Temp fix for #32875 (network commissioning cluster check for SSID on Thread feature) #32884

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2ebe3c
Temp fix for 32875
chrisdecenzo Apr 6, 2024
cbac1d7
Clarify comments
chrisdecenzo Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions src/app/clusters/network-commissioning/network-commissioning.cpp
View file
Open in desktop
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
Loading