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

quote addresses in YAML output

Browse source 
YAML strings should be quoted if they contain colon characters.
Since IPv6 addresses do, we now quote the query_address and
response_address strings in all YAML output.
This commit is contained in:
Evan Hunt 2022-08-26 17:58:55 -07:00
parent aba940dd90
commit 66eaf6bb73
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/dig/dig.c
View file

@ -784,7 +784,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);
}
@ -801,7 +801,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

@ -331,7 +331,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);
}
@ -342,7 +342,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);
}