From ccff953c25946ac6d4bf68ce2eebbf6ccc2ab837 Mon Sep 17 00:00:00 2001 From: Tony Finch Date: Mon, 9 Apr 2018 18:07:47 +0100 Subject: [PATCH 1/2] dnstap: log actual local IPv6 address, not :: listening address --- lib/ns/client.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ns/client.c b/lib/ns/client.c index b69e5e87b7..6ba515c4e9 100644 --- a/lib/ns/client.c +++ b/lib/ns/client.c @@ -1248,7 +1248,7 @@ client_send(ns_client_t *client) { #ifdef HAVE_DNSTAP if (client->view != NULL) { dns_dt_send(client->view, dtmsgtype, - &client->peeraddr, &client->interface->addr, + &client->peeraddr, &client->destsockaddr, ISC_TRUE, &zr, &client->requesttime, NULL, &buffer); } @@ -1278,7 +1278,7 @@ client_send(ns_client_t *client) { if (client->view != NULL) { dns_dt_send(client->view, dtmsgtype, &client->peeraddr, - &client->interface->addr, + &client->destsockaddr, ISC_FALSE, &zr, &client->requesttime, NULL, &buffer); } @@ -2826,7 +2826,7 @@ ns__client_request(isc_task_t *task, isc_event_t *event) { dtmsgtype = DNS_DTTYPE_AQ; dns_dt_send(client->view, dtmsgtype, &client->peeraddr, - &client->interface->addr, TCP_CLIENT(client), NULL, + &client->destsockaddr, TCP_CLIENT(client), NULL, &client->requesttime, NULL, buffer); #endif /* HAVE_DNSTAP */ From 330b26c9dffd3a5a484ac5acb0b8c7197061c9be Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Tue, 10 Apr 2018 17:13:06 -0700 Subject: [PATCH 2/2] CHANGES note --- CHANGES | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index 762963d66b..dababd96a1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,7 @@ +4922. [bug] dnstap: Log the destination address of client + packets rather than the interface address. + [GL #197] + 4921. [cleanup] Add dns_fixedname_initname() and refactor the caller code to make usage of the new function, as a part of refactoring dns_fixedname_*() macros were turned into