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

Correctly identify forwarded queries with DNSTAP

Browse source 
Queries using forwarders where not being correctly identified
when using dnstap.
This commit is contained in:
Mark Andrews 2026-01-30 13:45:39 +11:00
parent 77278beaf3
commit 38b626d58d
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/dns/resolver.c
View file

@ -2862,7 +2862,7 @@ resquery_send(resquery_t *query) {
/*
* Log the outgoing query via dnstap.
*/
if ((fctx->qmessage->flags & DNS_MESSAGEFLAG_RD) != 0) {
if (ISFORWARDER(query->addrinfo)) {
dtmsgtype = DNS_DTTYPE_FQ;
} else {
dtmsgtype = DNS_DTTYPE_RQ;
@ -9421,7 +9421,13 @@ rctx_logpacket(respctx_t *rctx) {
}
dns_compress_invalidate(&cctx);
if ((fctx->qmessage->flags & DNS_MESSAGEFLAG_RD) != 0) {
/*
* Check if the response came from a forwarder to correctly
* classify as Forward Response (FR) vs Recursive Response (RR)
* for DNSTAP logging. This is more accurate than using the RD
* flag which only indicates the original query intent.
*/
if (ISFORWARDER(rctx->query->addrinfo)) {
dtmsgtype = DNS_DTTYPE_FR;
} else {
dtmsgtype = DNS_DTTYPE_RR;