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

Make SetUpCodePairer only browse for nodes that are in commissioning mode. #17356

Merged
merged 2 commits into from
Apr 15, 2022
Merged

Make SetUpCodePairer only browse for nodes that are in commissioning mode. #17356

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0cfcbe
Make SetUpCodePairer only browse for nodes that are in commissioning …
bzbarsky-apple Apr 13, 2022
1a748ea
Address review comments
bzbarsky-apple Apr 14, 2022
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
19 changes: 18 additions & 1 deletion src/controller/SetUpCodePairer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,26 @@ CHIP_ERROR SetUpCodePairer::StartDiscoverOverIP(SetupPayload & payload)
: Dnssd::DiscoveryFilterType::kLongDiscriminator;
currentFilter.code =
payload.isShortDiscriminator ? static_cast<uint16_t>((payload.discriminator >> 8) & 0x0F) : payload.discriminator;

// We're going to ensure that anything we discover matches currentFilter
Damian-Nordic marked this conversation as resolved.
Show resolved Hide resolved
// before we use it, which will do our discriminator checks for us.
//
// We are using an mdns continuous query for some PTR record to discover
// devices. If the PTR record we use is for one of the discriminator-based
// subtypes (based on currentFilter), then we can run into a problem where
// we discover a (possibly stale) advertisement for a non-commissionable
// (CM=0) node and ignore it, and then when it becomes commissionable we
// don't notice because that just updates the TXT record to CM=1 and does
// not touch the PTR record we are querying for.
//
// So instead we query the PTR record for the "_CM" subtype, which will get
// added when a node enters commissioning mode.
Dnssd::DiscoveryFilter filter;
filter.type = Dnssd::DiscoveryFilterType::kCommissioningMode;

// Handle possibly-sync callbacks.
mWaitingForDiscovery[kIPTransport] = true;
CHIP_ERROR err = mCommissioner->DiscoverCommissionableNodes(currentFilter);
CHIP_ERROR err = mCommissioner->DiscoverCommissionableNodes(filter);
if (err != CHIP_NO_ERROR)
{
mWaitingForDiscovery[kIPTransport] = false;
Expand Down