mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 07:35:26 +00:00
Code Issues Releases Wiki Activity

log the xfrin pointer address in xfrin_log()

Browse Source 
to make it easier to trace xfrin events in the log, include
the address of the dns_xfrin_t object in all xfrin log messages.
This commit is contained in:
Evan Hunt
2023-02-21 21:09:05 -08:00
parent 9d37621012
commit 1dd42a80d6
1 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lib/dns/xfrin.c
View File

@@ -251,12 +251,9 @@ static isc_result_t
render(dns_message_t *msg, isc_mem_t *mctx, isc_buffer_t *buf); render(dns_message_t *msg, isc_mem_t *mctx, isc_buffer_t *buf);
static void static void
xfrin_logv(int level, const char *zonetext, const isc_sockaddr_t *primaryaddr, xfrin_logv(dns_xfrin_t *xff, int level, const char *zonetext,
const char *fmt, va_list ap) ISC_FORMAT_PRINTF(4, 0); const isc_sockaddr_t *primaryaddr, const char *fmt, va_list ap)
ISC_FORMAT_PRINTF(5, 0);
static void
xfrin_log1(int level, const char *zonetext, const isc_sockaddr_t *primaryaddr,
const char *fmt, ...) ISC_FORMAT_PRINTF(4, 5);
static void static void
xfrin_log(dns_xfrin_ctx_t *xfr, int level, const char *fmt, ...) xfrin_log(dns_xfrin_ctx_t *xfr, int level, const char *fmt, ...)
@@ -746,10 +743,7 @@ dns_xfrin_create(dns_zone_t *zone, dns_rdatatype_t xfrtype,
} }
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
char zonetext[DNS_NAME_MAXTEXT + 32]; xfrin_log(xfr, ISC_LOG_ERROR, "zone transfer setup failed");
dns_zone_name(zone, zonetext, sizeof(zonetext));
xfrin_log1(ISC_LOG_ERROR, zonetext, primaryaddr,
"zone transfer setup failed");
} }
return (result); return (result);
@@ -1635,8 +1629,8 @@ xfrin_destroy(dns_xfrin_ctx_t *xfr) {
* transfer of <zone> from <address>: <message> * transfer of <zone> from <address>: <message>
*/ */
static void static void
xfrin_logv(int level, const char *zonetext, const isc_sockaddr_t *primaryaddr, xfrin_logv(dns_xfrin_t *xfr, int level, const char *zonetext,
const char *fmt, va_list ap) { const isc_sockaddr_t *primaryaddr, const char *fmt, va_list ap) {
char primarytext[ISC_SOCKADDR_FORMATSIZE]; char primarytext[ISC_SOCKADDR_FORMATSIZE];
char msgtext[2048]; char msgtext[2048];
@@ -1644,28 +1638,10 @@ xfrin_logv(int level, const char *zonetext, const isc_sockaddr_t *primaryaddr,
vsnprintf(msgtext, sizeof(msgtext), fmt, ap); vsnprintf(msgtext, sizeof(msgtext), fmt, ap);
isc_log_write(dns_lctx, DNS_LOGCATEGORY_XFER_IN, DNS_LOGMODULE_XFER_IN, isc_log_write(dns_lctx, DNS_LOGCATEGORY_XFER_IN, DNS_LOGMODULE_XFER_IN,
level, "transfer of '%s' from %s: %s", zonetext, level, "%p: transfer of '%s' from %s: %s", xfr, zonetext,
primarytext, msgtext); primarytext, msgtext);
} }
/*
* Logging function for use when a xfrin_ctx_t has not yet been created.
*/
static void
xfrin_log1(int level, const char *zonetext, const isc_sockaddr_t *primaryaddr,
const char *fmt, ...) {
va_list ap;
if (!isc_log_wouldlog(dns_lctx, level)) {
return;
}
va_start(ap, fmt);
xfrin_logv(level, zonetext, primaryaddr, fmt, ap);
va_end(ap);
}
/* /*
* Logging function for use when there is a xfrin_ctx_t. * Logging function for use when there is a xfrin_ctx_t.
*/ */
@@ -1682,6 +1658,6 @@ xfrin_log(dns_xfrin_ctx_t *xfr, int level, const char *fmt, ...) {
dns_zone_name(xfr->zone, zonetext, sizeof(zonetext)); dns_zone_name(xfr->zone, zonetext, sizeof(zonetext));
va_start(ap, fmt); va_start(ap, fmt);
xfrin_logv(level, zonetext, &xfr->primaryaddr, fmt, ap); xfrin_logv(xfr, level, zonetext, &xfr->primaryaddr, fmt, ap);
va_end(ap); va_end(ap);
} }