From 0fcdcee276570cf33a03879aa21aa7ba4f3d9018 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Tue, 1 Mar 2022 08:43:10 -0500 Subject: [PATCH] Add extra logging to address resolve. (#15653) Logs now look like: ``` CHIP:-: Running chip event loop and waiting for finish... CHIP:DIS: Node ID resolved for 0x000000000001E1B9 CHIP:DIS: Addr 0: [fe80::ea68:e7ff:fe31:1684]:5540 CHIP:DIS: Addr 1: [2607:fea8:1fdf:1001:ea68:e7ff:fe31:1684]:5540 CHIP:DIS: Addr 2: [10.30.0.157]:5540 CHIP:DIS: Lookup clearing interface for non LL address CHIP:DIS: UDP:[2607:fea8:1fdf:1001:ea68:e7ff:fe31:1684%enp58s0]:5540: new best score: 7 CHIP:DIS: UDP:[fe80::ea68:e7ff:fe31:1684%enp58s0]:5540: score has not improved: 3 CHIP:DIS: UDP:10.30.0.157%enp58s0:5540: score has not improved: 2 CHIP:DIS: Checking node lookup status after 126 ms CHIP:DIS: Keeping DNSSD lookup active CHIP:DIS: Discovered node without a pending query CHIP:DIS: Node ID resolved for 0x000000000001E1B9 CHIP:DIS: Addr 0: [fe80::ea68:e7ff:fe31:1684]:5540 CHIP:DIS: Addr 1: [2607:fea8:1fdf:1001:ea68:e7ff:fe31:1684]:5540 CHIP:DIS: Addr 2: [10.30.0.157]:5540 CHIP:DIS: UDP:[2607:fea8:1fdf:1001:ea68:e7ff:fe31:1684%enp58s0]:5540: score has not improved: 7 CHIP:DIS: UDP:[fe80::ea68:e7ff:fe31:1684%enp58s0]:5540: score has not improved: 3 CHIP:DIS: UDP:10.30.0.157%enp58s0:5540: score has not improved: 2 CHIP:DIS: Checking node lookup status after 126 ms CHIP:DIS: Keeping DNSSD lookup active ``` --- .../address_resolve/AddressResolve_DefaultImpl.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp b/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp index 745a1fe1c9e3a8..7244eb71074c09 100644 --- a/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp +++ b/src/lib/address_resolve/AddressResolve_DefaultImpl.cpp @@ -103,6 +103,11 @@ void NodeLookupHandle::ResetForLookup(System::Clock::Timestamp now, const NodeLo void NodeLookupHandle::LookupResult(const ResolveResult & result) { +#if CHIP_PROGRESS_LOGGING + char addr_string[Transport::PeerAddress::kMaxToStringSize]; + result.address.ToString(addr_string); +#endif + unsigned newScore = ScoreValue(ScoreIpAddress(result.address.GetIPAddress(), result.address.GetInterface())); if (newScore > mBestAddressScore) { @@ -120,9 +125,11 @@ void NodeLookupHandle::LookupResult(const ResolveResult & result) } #if CHIP_PROGRESS_LOGGING - char addr_string[Transport::PeerAddress::kMaxToStringSize]; - mBestResult.address.ToString(addr_string); - ChipLogProgress(Discovery, "Address %s is scored at %u", addr_string, mBestAddressScore); + ChipLogProgress(Discovery, "%s: new best score: %u", addr_string, mBestAddressScore); + } + else + { + ChipLogProgress(Discovery, "%s: score has not improved: %u", addr_string, newScore); #endif } }