Improve discovery logging in SetUpCodePairer.

We should log why we are ignoring discovered devices.
project-chip · May 12, 2023 · c12a324 · c12a324
1 parent 305c026
commit c12a324
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/src/controller/SetUpCodePairer.cpp b/src/controller/SetUpCodePairer.cpp
@@ -309,33 +309,44 @@ bool SetUpCodePairer::NodeMatchesCurrentFilter(const Dnssd::DiscoveredNodeData &
 {
     if (nodeData.commissionData.commissioningMode == 0)
     {
+        ChipLogProgress(Controller, "Discovered device does not have an open commissioning window.");
         return false;
     }
 
     // The advertisement may not include a vendor id.
     if (IdIsPresent(mPayloadVendorID) && IdIsPresent(nodeData.commissionData.vendorId) &&
         mPayloadVendorID != nodeData.commissionData.vendorId)
     {
+        ChipLogProgress(Controller, "Discovered device does not match our vendor id.");
         return false;
     }
 
     // The advertisement may not include a product id.
     if (IdIsPresent(mPayloadProductID) && IdIsPresent(nodeData.commissionData.productId) &&
         mPayloadProductID != nodeData.commissionData.productId)
     {
+        ChipLogProgress(Controller, "Discovered device does not match our product id.");
         return false;
     }
 
+    bool discriminatorMatches = false;
     switch (mCurrentFilter.type)
     {
     case Dnssd::DiscoveryFilterType::kShortDiscriminator:
-        return ((nodeData.commissionData.longDiscriminator >> 8) & 0x0F) == mCurrentFilter.code;
+        discriminatorMatches = (((nodeData.commissionData.longDiscriminator >> 8) & 0x0F) == mCurrentFilter.code);
+        break;
     case Dnssd::DiscoveryFilterType::kLongDiscriminator:
-        return nodeData.commissionData.longDiscriminator == mCurrentFilter.code;
+        discriminatorMatches = (nodeData.commissionData.longDiscriminator == mCurrentFilter.code);
+        break;
     default:
+        ChipLogError(Controller, "Unknown filter type; all matches will fail");
         return false;
     }
-    return false;
+    if (!discriminatorMatches)
+    {
+        ChipLogProgress(Controller, "Discovered device does not match our discriminator.");
+    }
+    return discriminatorMatches;
 }
 
 void SetUpCodePairer::NotifyCommissionableDeviceDiscovered(const Dnssd::DiscoveredNodeData & nodeData)