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 4

Merge branch '3511-quote-yaml-addresses-v9_18' into 'v9_18'

Browse source 
quote addresses in YAML output

See merge request isc-projects/bind9!6717
This commit is contained in:
Evan Hunt 2022-08-31 23:39:50 +00:00
commit 19b98dc74f
4 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGES
View file

@ -1,3 +1,6 @@
5952. [bug] Use quotes around address strings in YAML output.
[GL #3511]
5951. [bug] In some cases, the dnstap query_message field was
erroneously set when logging response messages.
[GL #3501]

4
bin/dig/dig.c
View file

@ -790,7 +790,7 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg,
strlcat(sockstr, "0", sizeof(sockstr));
}
printf(" response_address: %s\n", sockstr);
printf(" response_address: \"%s\"\n", sockstr);
printf(" response_port: %u\n", sport);
}
@ -807,7 +807,7 @@ printmessage(dig_query_t *query, const isc_buffer_t *msgbuf, dns_message_t *msg,
strlcat(sockstr, "0", sizeof(sockstr));
}
printf(" query_address: %s\n", sockstr);
printf(" query_address: \"%s\"\n", sockstr);
printf(" query_port: %u\n", sport);
}

4
bin/tools/dnstap-read.c
View file

@ -266,7 +266,7 @@ print_yaml(dns_dtdata_t *dt) {
(void)inet_ntop(ip->len == 4 ? AF_INET : AF_INET6, ip->data,
buf, sizeof(buf));
printf(" query_address: %s\n", buf);
printf(" query_address: \"%s\"\n", buf);
}
if (m->has_response_address) {
@ -275,7 +275,7 @@ print_yaml(dns_dtdata_t *dt) {
(void)inet_ntop(ip->len == 4 ? AF_INET : AF_INET6, ip->data,
buf, sizeof(buf));
printf(" response_address: %s\n", buf);
printf(" response_address: \"%s\"\n", buf);
}
if (m->has_query_port) {

4
bin/tools/mdig.c
View file

@ -330,7 +330,7 @@ recvresponse(isc_task_t *task, isc_event_t *event) {
if (hash != NULL) {
*hash = '\0';
}
printf(" response_address: %s\n", sockstr);
printf(" response_address: \"%s\"\n", sockstr);
printf(" response_port: %u\n", sport);
}
@ -341,7 +341,7 @@ recvresponse(isc_task_t *task, isc_event_t *event) {
if (hash != NULL) {
*hash = '\0';
}
printf(" query_address: %s\n", sockstr);
printf(" query_address: \"%s\"\n", sockstr);
printf(" query_port: %u\n", sport);
}