upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '197-dnstap-sockaddr' into 'master'

Browse source 
Resolve "dnstap: log actual local IPv6 address, not :: listening address"

Closes #197

See merge request isc-projects/bind9!188
This commit is contained in:
Evan Hunt 2018-04-10 20:18:03 -04:00
commit 2ad82b0083
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -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

6
lib/ns/client.c
View file

@ -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 */