From b119a091eb4917296da269ce60116b4f60b76a14 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Mon, 5 Sep 2022 14:56:14 -0400 Subject: [PATCH] =?UTF-8?q?Reduce=20minmdns=20verbosity=20for=20common=20o?= =?UTF-8?q?perations:=20logs=20of=20send/receive=20=E2=80=A6=20(#22316)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Reduce minmdns verbosity for common operations: logs of send/receive packets and insufficient parsers * Reduce logging on IPv4 addresses as well when ipv4 is disabled --- src/lib/dnssd/IncrementalResolve.cpp | 8 ++++++++ src/lib/dnssd/Resolver_ImplMinimalMdns.cpp | 2 ++ src/lib/dnssd/minimal_mdns/ResponseSender.cpp | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/src/lib/dnssd/IncrementalResolve.cpp b/src/lib/dnssd/IncrementalResolve.cpp index 206d1a2f059cff..5934ef6d06d981 100644 --- a/src/lib/dnssd/IncrementalResolve.cpp +++ b/src/lib/dnssd/IncrementalResolve.cpp @@ -261,6 +261,7 @@ CHIP_ERROR IncrementalResolver::OnRecord(Inet::InterfaceId interface, const Reso return CHIP_NO_ERROR; } +#if INET_CONFIG_ENABLE_IPV4 Inet::IPAddress addr; if (!ParseARecord(data.GetData(), &addr)) { @@ -268,6 +269,13 @@ CHIP_ERROR IncrementalResolver::OnRecord(Inet::InterfaceId interface, const Reso } return OnIpAddress(interface, addr); +#else +#if CHIP_MINMDNS_HIGH_VERBOSITY + ChipLogProgress(Discovery, "Ignoring A record: IPv4 not supported"); +#endif + // skipping IPv4 addresses + return CHIP_NO_ERROR; +#endif } case QType::AAAA: { if (data.GetName() != mTargetHostName.Get()) diff --git a/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp b/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp index a7d44ac3018525..76aef704be593f 100644 --- a/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp +++ b/src/lib/dnssd/Resolver_ImplMinimalMdns.cpp @@ -230,7 +230,9 @@ void PacketParser::ParseSRVResource(const ResourceData & data) return; } +#if CHIP_MINMDNS_HIGH_VERBOSITY ChipLogError(Discovery, "Insufficient parsers to process all SRV entries."); +#endif } void PacketParser::ParseSrvRecords(const BytesRange & packet) diff --git a/src/lib/dnssd/minimal_mdns/ResponseSender.cpp b/src/lib/dnssd/minimal_mdns/ResponseSender.cpp index 9bef5b773defbf..7c6220baa4b8dd 100644 --- a/src/lib/dnssd/minimal_mdns/ResponseSender.cpp +++ b/src/lib/dnssd/minimal_mdns/ResponseSender.cpp @@ -196,14 +196,18 @@ CHIP_ERROR ResponseSender::FlushReply() if (mSendState.SendUnicast()) { +#if CHIP_MINMDNS_HIGH_VERBOSITY ChipLogDetail(Discovery, "Directly sending mDns reply to peer %s on port %d", srcAddressString, mSendState.GetSourcePort()); +#endif ReturnErrorOnFailure(mServer->DirectSend(mResponseBuilder.ReleasePacket(), mSendState.GetSourceAddress(), mSendState.GetSourcePort(), mSendState.GetSourceInterfaceId())); } else { +#if CHIP_MINMDNS_HIGH_VERBOSITY ChipLogDetail(Discovery, "Broadcasting mDns reply for query from %s", srcAddressString); +#endif ReturnErrorOnFailure(mServer->BroadcastSend(mResponseBuilder.ReleasePacket(), kMdnsStandardPort, mSendState.GetSourceInterfaceId(), mSendState.GetSourceAddress().Type())); }