upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-10 12:50:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Add few extra WANT_QUERYTRACE logs into resume_qmin

Browse source 
Print optionally a bit more details not passed to event in case
dns_view_findzonecut returns unexpected result. Result would be
visible later in foundevent, but found fname would be lost. Print it
into the log.

(cherry picked from commit d2c6966232)
This commit is contained in:
Petr Menšík 2025-06-10 14:35:03 +02:00 committed by Mark Andrews
parent eeda00329f
commit 4f972095fe
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/dns/resolver.c
View file

@ -105,6 +105,14 @@
DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(3), \
"fctx %p(%s): %s %s%u", fctx, fctx->info, (m1), (m2), \
(v))
#define FCTXTRACEN(m1, name, res) \
do { \
if (isc_log_wouldlog(dns_lctx, ISC_LOG_DEBUG(3))) { \
char dbuf[DNS_NAME_FORMATSIZE]; \
dns_name_format((name), dbuf, sizeof(dbuf)); \
FCTXTRACE4((m1), dbuf, (res)); \
} \
} while (0)
#define FTRACE(m) \
isc_log_write(dns_lctx, DNS_LOGCATEGORY_RESOLVER, \
DNS_LOGMODULE_RESOLVER, ISC_LOG_DEBUG(3), \
@ -156,6 +164,7 @@
UNUSED(m2); \
UNUSED(v); \
} while (0)
#define FCTXTRACEN(m1, name, res) FCTXTRACE4(m1, name, res)
#define FTRACE(m) \
do { \
UNUSED(m); \
@ -4488,6 +4497,7 @@ resume_qmin(isc_task_t *task, isc_event_t *event) {
result = dns_view_findzonecut(res->view, fctx->name, fname, dcname,
fctx->now, findoptions, true, true,
&fctx->nameservers, NULL);
FCTXTRACEN("resume_qmin findzonecut", fname, result);
/*
* DNS_R_NXDOMAIN here means we have not loaded the root zone
@ -5402,10 +5412,13 @@ clone_results(fetchctx_t *fctx) {
for (event = ISC_LIST_HEAD(fctx->events); event != NULL;
event = ISC_LIST_NEXT(event, ev_link))
{
/* This is the the head event; keep a pointer and move
* on */
/*
* This is the the head event; keep a pointer and move on.
*/
if (hevent == NULL) {
hevent = ISC_LIST_HEAD(fctx->events);
FCTXTRACEN("clone_results", hevent->foundname,
hevent->result);
continue;
}