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

Jump to bottom

Always search on-network #12321

Merged
merged 5 commits into from
Dec 7, 2021
Merged

Always search on-network #12321

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e0a17f8
Always search on-network
cecille Nov 29, 2021
b1b095e
Comment from review.
cecille Nov 30, 2021
156fa9f
Merge remote-tracking branch 'upstream/master' into setupcodepairer_a…
cecille Dec 1, 2021
c824d0a
Merge remote-tracking branch 'upstream/master' into setupcodepairer_a…
cecille Dec 3, 2021
adbc1dc
Merge remote-tracking branch 'upstream/master' into setupcodepairer_a…
cecille Dec 3, 2021
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
3 changes: 2 additions & 1 deletion src/controller/SetUpCodePairer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ CHIP_ERROR SetUpCodePairer::Connect(RendezvousInformationFlag rendezvousInformat
VerifyOrReturnError(searchOverAll || CHIP_NO_ERROR == err, err);
}

if (searchOverAll || rendezvousInformation == RendezvousInformationFlag::kOnNetwork)
// We always want to search on network because any node that has already been commissioned will use on-network regardless of the
// QR code flag.
cecille marked this conversation as resolved.
Show resolved Hide resolved
{
if (CHIP_NO_ERROR == (err = StartDiscoverOverIP(discriminator, isShort)))
{
Expand Down