mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

dns_message_logfmtpacket(): drop 'style' parameter

Browse Source 
Both existing callers of the dns_message_logfmtpacket() function set the
argument passed as 'style' to &dns_master_style_comment.  To simplify
these call sites, drop the 'style' parameter from the prototype for
dns_message_logfmtpacket() and use a fixed value of
&dns_master_style_comment in the function's body instead.
This commit is contained in:
Michał Kępień
2024-12-31 05:40:48 +01:00
parent 064b2c6889
commit 05d69bd7a4
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/dns/include/dns/message.h
View File

@@ -1404,8 +1404,7 @@ void
dns_message_logfmtpacket(dns_message_t *message, const char *description, dns_message_logfmtpacket(dns_message_t *message, const char *description,
const isc_sockaddr_t *address, const isc_sockaddr_t *address,
isc_logcategory_t category, isc_logmodule_t module, isc_logcategory_t category, isc_logmodule_t module,
const dns_master_style_t *style, int level, int level, isc_mem_t *mctx);
isc_mem_t *mctx);
/*%< /*%<
* Log 'message' at the specified logging parameters. * Log 'message' at the specified logging parameters.
* *
@@ -1422,7 +1421,6 @@ dns_message_logfmtpacket(dns_message_t *message, const char *description,
* \li address to be non NULL. * \li address to be non NULL.
* \li category to be valid. * \li category to be valid.
* \li module to be valid. * \li module to be valid.
* \li style to be valid.
* \li mctx to be a valid. * \li mctx to be a valid.
*/ */

7
lib/dns/message.c
View File

@@ -4741,12 +4741,11 @@ void
dns_message_logfmtpacket(dns_message_t *message, const char *description, dns_message_logfmtpacket(dns_message_t *message, const char *description,
const isc_sockaddr_t *address, const isc_sockaddr_t *address,
isc_logcategory_t category, isc_logmodule_t module, isc_logcategory_t category, isc_logmodule_t module,
const dns_master_style_t *style, int level, int level, isc_mem_t *mctx) {
isc_mem_t *mctx) {
REQUIRE(address != NULL); REQUIRE(address != NULL);
logfmtpacket(message, description, address, category, module, style, logfmtpacket(message, description, address, category, module,
level, mctx); &dns_master_style_comment, level, mctx);
} }
static void static void

5
lib/dns/resolver.c
View File

@@ -2712,7 +2712,7 @@ resquery_send(resquery_t *query) {
dns_message_logfmtpacket( dns_message_logfmtpacket(
fctx->qmessage, "sending packet to", &query->addrinfo->sockaddr, fctx->qmessage, "sending packet to", &query->addrinfo->sockaddr,
DNS_LOGCATEGORY_RESOLVER, DNS_LOGMODULE_PACKETS, DNS_LOGCATEGORY_RESOLVER, DNS_LOGMODULE_PACKETS,
&dns_master_style_comment, ISC_LOG_DEBUG(11), fctx->mctx); ISC_LOG_DEBUG(11), fctx->mctx);
/* /*
* We're now done with the query message. * We're now done with the query message.
@@ -9732,8 +9732,7 @@ rctx_logpacket(respctx_t *rctx) {
dns_message_logfmtpacket( dns_message_logfmtpacket(
rctx->query->rmessage, "received packet from", rctx->query->rmessage, "received packet from",
&rctx->query->addrinfo->sockaddr, DNS_LOGCATEGORY_RESOLVER, &rctx->query->addrinfo->sockaddr, DNS_LOGCATEGORY_RESOLVER,
DNS_LOGMODULE_PACKETS, &dns_master_style_comment, DNS_LOGMODULE_PACKETS, ISC_LOG_DEBUG(10), fctx->mctx);
ISC_LOG_DEBUG(10), fctx->mctx);
#ifdef HAVE_DNSTAP #ifdef HAVE_DNSTAP
/* /*