From: Michał Kępień <michal@isc.org>
Date: Tue, 31 Dec 2024 04:40:48 +0000 (+0100)
Subject: Adjust dns_message_logpacketfromto() log prefixes
X-Git-Tag: v9.21.4~9^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=58d38352eebbc6ed3c917c52ac693d3df8a3b94c;p=thirdparty%2Fbind9.git

Adjust dns_message_logpacketfromto() log prefixes

Ensure the log prefixes passed to the dns_message_logpacketfromto()
function by its callers do not include the words "from" or "to" as those
are now emitted by the logfmtpacket() helper function.
---

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 17e24c3ef70..9ae536eb4a5 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -2715,9 +2715,9 @@ resquery_send(resquery_t *query) {
 	}
 
 	dns_message_logpacketfromto(
-		fctx->qmessage, "sending packet to", la, &query->addrinfo->sockaddr,
-		DNS_LOGCATEGORY_RESOLVER, DNS_LOGMODULE_PACKETS,
-		ISC_LOG_DEBUG(11), fctx->mctx);
+		fctx->qmessage, "sending packet", la,
+		&query->addrinfo->sockaddr, DNS_LOGCATEGORY_RESOLVER,
+		DNS_LOGMODULE_PACKETS, ISC_LOG_DEBUG(11), fctx->mctx);
 
 	/*
 	 * We're now done with the query message.
@@ -9736,7 +9736,7 @@ rctx_logpacket(respctx_t *rctx) {
 	}
 
 	dns_message_logpacketfromto(
-		rctx->query->rmessage, "received packet from",
+		rctx->query->rmessage, "received packet",
 		&rctx->query->addrinfo->sockaddr, la, DNS_LOGCATEGORY_RESOLVER,
 		DNS_LOGMODULE_PACKETS, ISC_LOG_DEBUG(10), fctx->mctx);