From e0a17f898e65992ec840e1bab143c99a6625644c Mon Sep 17 00:00:00 2001 From: Cecille Freeman Date: Mon, 29 Nov 2021 11:06:20 -0500 Subject: [PATCH] Always search on-network Nodes that have already been commissioned will always use on-network setup regardless of what is in the setup payload. --- src/controller/SetUpCodePairer.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/controller/SetUpCodePairer.cpp b/src/controller/SetUpCodePairer.cpp index f4b7ac3ae6cfba..e4b4b4989a4fd1 100644 --- a/src/controller/SetUpCodePairer.cpp +++ b/src/controller/SetUpCodePairer.cpp @@ -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. { if (CHIP_NO_ERROR == (err = StartDiscoverOverIP(discriminator, isShort))) {