Adjust dns_message_logpacketfrom() log prefixes

Ensure the log prefixes passed to the dns_message_logpacketfrom()
function by its callers do not include the word "from" as the latter is
now emitted by the logfmtpacket() helper function.

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 9ae536eb4a592e1ccab53a337f61bdc0afadf943..70900c4cc0c56a007575c5da3eb0a6ef54f5b276 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -8163,7 +8163,7 @@ rctx_edns(respctx_t *rctx) {
            bad_edns(fctx, &query->addrinfo->sockaddr))
        {
                dns_message_logpacketfrom(
-                       query->rmessage, "received packet (bad edns) from",
+                       query->rmessage, "received packet (bad edns)",
                        &query->addrinfo->sockaddr, DNS_LOGCATEGORY_RESOLVER,
                        DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(3), fctx->mctx);
                dns_adb_changeflags(fctx->adb, query->addrinfo,
@@ -8189,7 +8189,7 @@ rctx_edns(respctx_t *rctx) {
                 * to NOERROR and NXDOMAIN.
                 */
                dns_message_logpacketfrom(
-                       query->rmessage, "received packet (no opt) from",
+                       query->rmessage, "received packet (no opt)",
                        &query->addrinfo->sockaddr, DNS_LOGCATEGORY_RESOLVER,
                        DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(3), fctx->mctx);
                dns_adb_changeflags(fctx->adb, query->addrinfo,

diff --git a/lib/dns/xfrin.c b/lib/dns/xfrin.c
index 617f8456c0e7a8cfa072b3bf6c29e3024203d076..b5c9b5941ce028f817c5ca2953322de32203e0b6 100644 (file)
--- a/lib/dns/xfrin.c
+++ b/lib/dns/xfrin.c
@@ -1761,7 +1761,7 @@ xfrin_recv_done(isc_result_t result, isc_region_t *region, void *arg) {
                                   DNS_MESSAGEPARSE_PRESERVEORDER);
        if (result == ISC_R_SUCCESS) {
                dns_message_logpacketfrom(
-                       msg, "received message from", &xfr->primaryaddr,
+                       msg, "received message", &xfr->primaryaddr,
                        DNS_LOGCATEGORY_XFER_IN, DNS_LOGMODULE_XFER_IN,
                        ISC_LOG_DEBUG(10), xfr->mctx);
        } else {