Address review comments

project-chip · Jul 21, 2022 · 3684a3f · 3684a3f
1 parent 2988a60
commit 3684a3f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/lib/dnssd/Discovery_ImplPlatform.cpp b/src/lib/dnssd/Discovery_ImplPlatform.cpp
@@ -70,17 +70,15 @@ static void HandleNodeResolve(void * context, DnssdService * result, const Span<
 
     nodeData.resolutionData.port = result->mPort;
 
-    ChipLogDetail(Discovery, "Node with instance name %s discovered. TXT:", nodeData.commissionData.instanceName);
     for (size_t i = 0; i < result->mTextEntrySize; ++i)
     {
-        ChipLogDetail(Discovery, "  %s: %.*s", result->mTextEntries[i].mKey, static_cast<int>(result->mTextEntries[i].mDataSize),
-                      result->mTextEntries[i].mData);
         ByteSpan key(reinterpret_cast<const uint8_t *>(result->mTextEntries[i].mKey), strlen(result->mTextEntries[i].mKey));
         ByteSpan val(result->mTextEntries[i].mData, result->mTextEntries[i].mDataSize);
         FillNodeDataFromTxt(key, val, nodeData.resolutionData);
         FillNodeDataFromTxt(key, val, nodeData.commissionData);
     }
 
+    nodeData.LogDetail();
     proxy->OnNodeDiscovered(nodeData);
     proxy->Release();
 }
@@ -137,11 +135,8 @@ static void HandleNodeIdResolve(void * context, DnssdService * result, const Spa
     }
     nodeData.resolutionData.numIPs = addressesFound;
 
-    ChipLogDetail(Discovery, "Node with operational ID %s resolved. TXT:", result->mName);
     for (size_t i = 0; i < result->mTextEntrySize; ++i)
     {
-        ChipLogDetail(Discovery, "  %s: %.*s", result->mTextEntries[i].mKey, static_cast<int>(result->mTextEntries[i].mDataSize),
-                      result->mTextEntries[i].mData);
         ByteSpan key(reinterpret_cast<const uint8_t *>(result->mTextEntries[i].mKey), strlen(result->mTextEntries[i].mKey));
         ByteSpan val(result->mTextEntries[i].mData, result->mTextEntries[i].mDataSize);
         FillNodeDataFromTxt(key, val, nodeData.resolutionData);

diff --git a/src/lib/dnssd/Resolver.h b/src/lib/dnssd/Resolver.h
@@ -125,6 +125,7 @@ struct CommonResolutionData
         {
             ChipLogDetail(Discovery, "\tMrp Interval active: not present");
         }
+        ChipLogDetail(Discovery, "\tTCP Supported: %d", supportsTcp);
     }
 };
 
@@ -243,6 +244,7 @@ struct DiscoveredNodeData
 
     void LogDetail() const
     {
+        ChipLogDetail(Discovery, "Discovered node:");
         resolutionData.LogDetail();
         commissionData.LogDetail();
     }