mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

refactor, add missing EDNS options, and fix option names

Browse Source 
some EDNS option names, including DAU, DHU, N3U, and CHAIN,
were not printed in dns_message_pseudosectiontotext() or
_psuedosectiontoyaml(); they were displayed as unknown options.
this has been corrected.

that code was also refactored to use switch instead of if/else,
and to look up the option code names in a table to prevent
inconsistencies between the two formats. one such inconsistency
was corrected: the "TCP-KEEPALIVE" option is now always printed
with a hyphen, instead of being "TCP KEEPALIVE" when not using
YAML. the keepalive system test has been updated to expect this.

EDNS options that print DNS names (i.e., CHAIN and Report-Channel)
now enclose them in quotation marks to ensure YAML correctness.
the auth system test has been updated to expect this when grepping
for Report-Channel options.
This commit is contained in:
Evan Hunt
2024-10-24 16:55:31 -07:00
parent c30754f28b
commit e2393ba27b
4 changed files with 165 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
bin/tests/system/auth/tests.sh
View File

@@ -190,7 +190,7 @@ n=$((n + 1))
echo_i "check that a Report-Channel EDNS option is added to responses ($n)" echo_i "check that a Report-Channel EDNS option is added to responses ($n)"
ret=0 ret=0
$DIG $DIGOPTS @10.53.0.1 example.net >dig.out.test$n $DIG $DIGOPTS @10.53.0.1 example.net >dig.out.test$n
grep "; Report-Channel: example.rad" dig.out.test$n >/dev/null || ret=1 grep "; Report-Channel: \"example.rad\"" dig.out.test$n >/dev/null || ret=1
[ $ret -eq 0 ] || echo_i "failed" [ $ret -eq 0 ] || echo_i "failed"
status=$((status + ret)) status=$((status + ret))
@@ -198,7 +198,7 @@ n=$((n + 1))
echo_i "check that Report-Channel option is omitted for names in error-logging zones ($n)" echo_i "check that Report-Channel option is omitted for names in error-logging zones ($n)"
ret=0 ret=0
$DIG $DIGOPTS @10.53.0.1 example.rad >dig.out.test$n $DIG $DIGOPTS @10.53.0.1 example.rad >dig.out.test$n
grep "; Report-Channel: example.rad" dig.out.test$n >/dev/null && ret=1 grep "; Report-Channel: \"example.rad\"" dig.out.test$n >/dev/null && ret=1
[ $ret -eq 0 ] || echo_i "failed" [ $ret -eq 0 ] || echo_i "failed"
status=$((status + ret)) status=$((status + ret))
@@ -206,7 +206,7 @@ n=$((n + 1))
echo_i "check that Report-Channel option is omitted for zones above the agent-domain ($n)" echo_i "check that Report-Channel option is omitted for zones above the agent-domain ($n)"
ret=0 ret=0
$DIG $DIGOPTS @10.53.0.1 rad >dig.out.test$n $DIG $DIGOPTS @10.53.0.1 rad >dig.out.test$n
grep "; Report-Channel: example.rad" dig.out.test$n >/dev/null && ret=1 grep "; Report-Channel: \"example.rad\"" dig.out.test$n >/dev/null && ret=1
[ $ret -eq 0 ] || echo_i "failed" [ $ret -eq 0 ] || echo_i "failed"
status=$((status + ret)) status=$((status + ret))
@@ -214,7 +214,7 @@ n=$((n + 1))
echo_i "check that a zone-level Report-Channel EDNS option is added to responses ($n)" echo_i "check that a zone-level Report-Channel EDNS option is added to responses ($n)"
ret=0 ret=0
$DIG $DIGOPTS @10.53.0.1 example.com >dig.out.test$n $DIG $DIGOPTS @10.53.0.1 example.com >dig.out.test$n
grep "; Report-Channel: rad.example.net" dig.out.test$n >/dev/null || ret=1 grep "; Report-Channel: \"rad.example.net\"" dig.out.test$n >/dev/null || ret=1
[ $ret -eq 0 ] || echo_i "failed" [ $ret -eq 0 ] || echo_i "failed"
status=$((status + ret)) status=$((status + ret))
@@ -224,7 +224,7 @@ ret=0
nextpart ns1/named.run >/dev/null nextpart ns1/named.run >/dev/null
$DIG $DIGOPTS @10.53.0.1 _er.0.example.1._er.example.rad TXT >dig.out.test$n $DIG $DIGOPTS @10.53.0.1 _er.0.example.1._er.example.rad TXT >dig.out.test$n
nextpart ns1/named.run | grep "dns-reporting-agent '_er.0.example.1._er.example.rad/IN'" >/dev/null || ret=1 nextpart ns1/named.run | grep "dns-reporting-agent '_er.0.example.1._er.example.rad/IN'" >/dev/null || ret=1
grep "; Report-Channel: example.rad" dig.out.test$n >/dev/null && ret=1 grep "; Report-Channel: \"example.rad\"" dig.out.test$n >/dev/null && ret=1
[ $ret -eq 0 ] || echo_i "failed" [ $ret -eq 0 ] || echo_i "failed"
status=$((status + ret)) status=$((status + ret))
@@ -234,7 +234,7 @@ ret=0
nextpart ns1/named.run >/dev/null nextpart ns1/named.run >/dev/null
$DIG $DIGOPTS @10.53.0.1 _er.0.example.1._er.example.com TXT >dig.out.test$n $DIG $DIGOPTS @10.53.0.1 _er.0.example.1._er.example.com TXT >dig.out.test$n
nextpart ns1/named.run | grep "dns-reporting-agent '_er.0.example.1._er.example.com/IN'" >/dev/null && ret=1 nextpart ns1/named.run | grep "dns-reporting-agent '_er.0.example.1._er.example.com/IN'" >/dev/null && ret=1
grep "; Report-Channel: rad.example.net" dig.out.test$n >/dev/null || ret=1 grep "; Report-Channel: \"rad.example.net\"" dig.out.test$n >/dev/null || ret=1
[ $ret -eq 0 ] || echo_i "failed" [ $ret -eq 0 ] || echo_i "failed"
status=$((status + ret)) status=$((status + ret))

12
bin/tests/system/keepalive/tests.sh
View File

@@ -25,7 +25,7 @@ echo_i "checking that dig handles TCP keepalive ($n)"
ret=0 ret=0
n=$((n + 1)) n=$((n + 1))
$DIG $DIGOPTS +qr +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1 $DIG $DIGOPTS +qr +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1
grep "; TCP KEEPALIVE" dig.out.test$n >/dev/null || ret=1 grep "; TCP-KEEPALIVE" dig.out.test$n >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
@@ -41,7 +41,7 @@ echo_i "checking that TCP keepalive is added for TCP responses ($n)"
ret=0 ret=0
n=$((n + 1)) n=$((n + 1))
$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1 $DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1
grep "; TCP KEEPALIVE" dig.out.test$n >/dev/null || ret=1 grep "; TCP-KEEPALIVE" dig.out.test$n >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
@@ -49,7 +49,7 @@ echo_i "checking that TCP keepalive requires TCP ($n)"
ret=0 ret=0
n=$((n + 1)) n=$((n + 1))
$DIG $DIGOPTS +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1 $DIG $DIGOPTS +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1
grep "; TCP KEEPALIVE" dig.out.test$n >/dev/null && ret=1 grep "; TCP-KEEPALIVE" dig.out.test$n >/dev/null && ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
@@ -57,7 +57,7 @@ echo_i "checking default value ($n)"
ret=0 ret=0
n=$((n + 1)) n=$((n + 1))
$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.3 >dig.out.test$n || ret=1 $DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.3 >dig.out.test$n || ret=1
grep "; TCP KEEPALIVE: 30.0 secs" dig.out.test$n >/dev/null || ret=1 grep "; TCP-KEEPALIVE: 30.0 secs" dig.out.test$n >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
@@ -65,7 +65,7 @@ echo_i "checking configured value ($n)"
ret=0 ret=0
n=$((n + 1)) n=$((n + 1))
$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1 $DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1
grep "; TCP KEEPALIVE: 15.0 secs" dig.out.test$n >/dev/null || ret=1 grep "; TCP-KEEPALIVE: 15.0 secs" dig.out.test$n >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
@@ -75,7 +75,7 @@ n=$((n + 1))
$RNDCCMD tcp-timeouts 300 300 300 200 >output $RNDCCMD tcp-timeouts 300 300 300 200 >output
diff -b output expected || ret=1 diff -b output expected || ret=1
$DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1 $DIG $DIGOPTS +vc +keepalive foo.example @10.53.0.2 >dig.out.test$n || ret=1
grep "; TCP KEEPALIVE: 20.0 secs" dig.out.test$n >/dev/null || ret=1 grep "; TCP-KEEPALIVE: 20.0 secs" dig.out.test$n >/dev/null || ret=1
if [ $ret != 0 ]; then echo_i "failed"; fi if [ $ret != 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))

5
lib/dns/include/dns/message.h
View File

@@ -106,16 +106,21 @@
#define DNS_OPT_LLQ 1 /*%< LLQ opt code */ #define DNS_OPT_LLQ 1 /*%< LLQ opt code */
#define DNS_OPT_UL 2 /*%< UL opt code */ #define DNS_OPT_UL 2 /*%< UL opt code */
#define DNS_OPT_NSID 3 /*%< NSID opt code */ #define DNS_OPT_NSID 3 /*%< NSID opt code */
#define DNS_OPT_DAU 5 /*%< DNSSEC algorithm understood */
#define DNS_OPT_DHU 6 /*%< DNSSEC hash understood */
#define DNS_OPT_N3U 7 /*%< NSEC3 hash understood */
#define DNS_OPT_CLIENT_SUBNET 8 /*%< client subnet opt code */ #define DNS_OPT_CLIENT_SUBNET 8 /*%< client subnet opt code */
#define DNS_OPT_EXPIRE 9 /*%< EXPIRE opt code */ #define DNS_OPT_EXPIRE 9 /*%< EXPIRE opt code */
#define DNS_OPT_COOKIE 10 /*%< COOKIE opt code */ #define DNS_OPT_COOKIE 10 /*%< COOKIE opt code */
#define DNS_OPT_TCP_KEEPALIVE 11 /*%< TCP keepalive opt code */ #define DNS_OPT_TCP_KEEPALIVE 11 /*%< TCP keepalive opt code */
#define DNS_OPT_PAD 12 /*%< PAD opt code */ #define DNS_OPT_PAD 12 /*%< PAD opt code */
#define DNS_OPT_CHAIN 13 /*%< CHAIN opt code */
#define DNS_OPT_KEY_TAG 14 /*%< Key tag opt code */ #define DNS_OPT_KEY_TAG 14 /*%< Key tag opt code */
#define DNS_OPT_EDE 15 /*%< Extended DNS Error opt code */ #define DNS_OPT_EDE 15 /*%< Extended DNS Error opt code */
#define DNS_OPT_CLIENT_TAG 16 /*%< Client tag opt code */ #define DNS_OPT_CLIENT_TAG 16 /*%< Client tag opt code */
#define DNS_OPT_SERVER_TAG 17 /*%< Server tag opt code */ #define DNS_OPT_SERVER_TAG 17 /*%< Server tag opt code */
#define DNS_OPT_REPORT_CHANNEL 18 /*%< DNS Reporting Channel */ #define DNS_OPT_REPORT_CHANNEL 18 /*%< DNS Reporting Channel */
#define DNS_OPT_ZONEVERSION 19 /*%< Zoneversion opt code */
/*%< Experimental options [65001...65534] as per RFC6891 */ /*%< Experimental options [65001...65534] as per RFC6891 */

239
lib/dns/message.c
View File

@@ -3607,7 +3607,7 @@ cleanup:
} }
static isc_result_t static isc_result_t
render_reportchan(isc_buffer_t *optbuf, isc_buffer_t *target) { render_nameopt(isc_buffer_t *optbuf, isc_buffer_t *target) {
dns_decompress_t dctx = DNS_DECOMPRESS_NEVER; dns_decompress_t dctx = DNS_DECOMPRESS_NEVER;
dns_fixedname_t fixed; dns_fixedname_t fixed;
dns_name_t *name = dns_fixedname_initname(&fixed); dns_name_t *name = dns_fixedname_initname(&fixed);
@@ -3617,8 +3617,9 @@ render_reportchan(isc_buffer_t *optbuf, isc_buffer_t *target) {
result = dns_name_fromwire(name, optbuf, dctx, NULL); result = dns_name_fromwire(name, optbuf, dctx, NULL);
if (result == ISC_R_SUCCESS && isc_buffer_activelength(optbuf) == 0) { if (result == ISC_R_SUCCESS && isc_buffer_activelength(optbuf) == 0) {
dns_name_format(name, namebuf, sizeof(namebuf)); dns_name_format(name, namebuf, sizeof(namebuf));
ADD_STRING(target, " "); ADD_STRING(target, " \"");
ADD_STRING(target, namebuf); ADD_STRING(target, namebuf);
ADD_STRING(target, "\"");
return (result); return (result);
} }
result = ISC_R_FAILURE; result = ISC_R_FAILURE;
@@ -3626,6 +3627,27 @@ cleanup:
return (result); return (result);
} }
static const char *option_names[] = {
[DNS_OPT_LLQ] = "LLQ",
[DNS_OPT_UL] = "UL",
[DNS_OPT_NSID] = "NSID",
[DNS_OPT_DAU] = "DAU",
[DNS_OPT_DHU] = "DHU",
[DNS_OPT_N3U] = "N3U",
[DNS_OPT_CLIENT_SUBNET] = "CLIENT-SUBNET",
[DNS_OPT_EXPIRE] = "EXPIRE",
[DNS_OPT_COOKIE] = "COOKIE",
[DNS_OPT_TCP_KEEPALIVE] = "TCP-KEEPALIVE",
[DNS_OPT_PAD] = "PADDING",
[DNS_OPT_CHAIN] = "CHAIN",
[DNS_OPT_KEY_TAG] = "KEY-TAG",
[DNS_OPT_EDE] = "EDE",
[DNS_OPT_CLIENT_TAG] = "CLIENT-TAG",
[DNS_OPT_SERVER_TAG] = "SERVER-TAG",
[DNS_OPT_REPORT_CHANNEL] = "Report-Channel",
[DNS_OPT_ZONEVERSION] = "ZONEVERSION",
};
static isc_result_t static isc_result_t
dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section, dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section,
const dns_master_style_t *style, const dns_master_style_t *style,
@@ -3640,8 +3662,9 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section,
isc_buffer_t optbuf; isc_buffer_t optbuf;
uint16_t optcode, optlen; uint16_t optcode, optlen;
size_t saved_count; size_t saved_count;
unsigned char *optdata; unsigned char *optdata = NULL;
unsigned int indent; unsigned int indent;
isc_buffer_t ecsbuf;
REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(DNS_MESSAGE_VALID(msg));
REQUIRE(target != NULL); REQUIRE(target != NULL);
@@ -3709,15 +3732,28 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section,
isc_buffer_add(&optbuf, rdata.length); isc_buffer_add(&optbuf, rdata.length);
while (isc_buffer_remaininglength(&optbuf) != 0) { while (isc_buffer_remaininglength(&optbuf) != 0) {
bool extra_text = false; bool extra_text = false;
const char *option_name = NULL;
msg->indent.count = indent; msg->indent.count = indent;
INSIST(isc_buffer_remaininglength(&optbuf) >= 4U); INSIST(isc_buffer_remaininglength(&optbuf) >= 4U);
optcode = isc_buffer_getuint16(&optbuf); optcode = isc_buffer_getuint16(&optbuf);
optlen = isc_buffer_getuint16(&optbuf); optlen = isc_buffer_getuint16(&optbuf);
INSIST(isc_buffer_remaininglength(&optbuf) >= optlen); INSIST(isc_buffer_remaininglength(&optbuf) >= optlen);
if (optcode == DNS_OPT_LLQ) {
INDENT(style); INDENT(style);
ADD_STRING(target, "LLQ:"); if (optcode < ARRAY_SIZE(option_names)) {
option_name = option_names[optcode];
}
if (option_name != NULL) {
ADD_STRING(target, option_names[optcode])
} else {
snprintf(buf, sizeof(buf), "OPT=%u", optcode);
ADD_STRING(target, buf);
}
ADD_STRING(target, ":");
switch (optcode) {
case DNS_OPT_LLQ:
if (optlen == 18U) { if (optlen == 18U) {
result = render_llq(&optbuf, target); result = render_llq(&optbuf, target);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
@@ -3726,9 +3762,8 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section,
ADD_STRING(target, "\n"); ADD_STRING(target, "\n");
continue; continue;
} }
} else if (optcode == DNS_OPT_UL) { break;
INDENT(style); case DNS_OPT_UL:
ADD_STRING(target, "UL:");
if (optlen == 4U || optlen == 8U) { if (optlen == 4U || optlen == 8U) {
uint32_t secs, key = 0; uint32_t secs, key = 0;
secs = isc_buffer_getuint32(&optbuf); secs = isc_buffer_getuint32(&optbuf);
@@ -3759,16 +3794,8 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section,
ADD_STRING(target, ")\n"); ADD_STRING(target, ")\n");
continue; continue;
} }
} else if (optcode == DNS_OPT_NSID) { break;
INDENT(style); case DNS_OPT_CLIENT_SUBNET:
ADD_STRING(target, "NSID:");
} else if (optcode == DNS_OPT_COOKIE) {
INDENT(style);
ADD_STRING(target, "COOKIE:");
} else if (optcode == DNS_OPT_CLIENT_SUBNET) {
isc_buffer_t ecsbuf;
INDENT(style);
ADD_STRING(target, "CLIENT-SUBNET:");
isc_buffer_init(&ecsbuf, isc_buffer_init(&ecsbuf,
isc_buffer_current(&optbuf), isc_buffer_current(&optbuf),
optlen); optlen);
@@ -3783,9 +3810,8 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section,
continue; continue;
} }
ADD_STRING(target, "\n"); ADD_STRING(target, "\n");
} else if (optcode == DNS_OPT_EXPIRE) { break;
INDENT(style); case DNS_OPT_EXPIRE:
ADD_STRING(target, "EXPIRE:");
if (optlen == 4) { if (optlen == 4) {
uint32_t secs; uint32_t secs;
secs = isc_buffer_getuint32(&optbuf); secs = isc_buffer_getuint32(&optbuf);
@@ -3800,31 +3826,37 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section,
ADD_STRING(target, ")\n"); ADD_STRING(target, ")\n");
continue; continue;
} }
} else if (optcode == DNS_OPT_TCP_KEEPALIVE) { break;
case DNS_OPT_TCP_KEEPALIVE:
if (optlen == 2) { if (optlen == 2) {
unsigned int dsecs; unsigned int dsecs;
dsecs = isc_buffer_getuint16(&optbuf); dsecs = isc_buffer_getuint16(&optbuf);
INDENT(style);
ADD_STRING(target, "TCP-KEEPALIVE: ");
snprintf(buf, sizeof(buf), "%u.%u", snprintf(buf, sizeof(buf), "%u.%u",
dsecs / 10U, dsecs % 10U); dsecs / 10U, dsecs % 10U);
ADD_STRING(target, buf); ADD_STRING(target, buf);
ADD_STRING(target, " secs\n"); ADD_STRING(target, " secs\n");
continue; continue;
} }
INDENT(style); break;
ADD_STRING(target, "TCP-KEEPALIVE:"); case DNS_OPT_CHAIN:
} else if (optcode == DNS_OPT_PAD) { if (optlen > 0U) {
INDENT(style); isc_buffer_t sb = optbuf;
ADD_STRING(target, "PAD:"); isc_buffer_setactive(&optbuf, optlen);
} else if (optcode == DNS_OPT_KEY_TAG) { result = render_nameopt(&optbuf,
INDENT(style); target);
ADD_STRING(target, "KEY-TAG:"); if (result == ISC_R_SUCCESS) {
ADD_STRING(target, "\n");
continue;
}
optbuf = sb;
}
break;
case DNS_OPT_KEY_TAG:
if (optlen > 0U && (optlen % 2U) == 0U) { if (optlen > 0U && (optlen % 2U) == 0U) {
const char *sep = ""; const char *sep = "";
uint16_t id;
while (optlen > 0U) { while (optlen > 0U) {
id = isc_buffer_getuint16( uint16_t id =
isc_buffer_getuint16(
&optbuf); &optbuf);
snprintf(buf, sizeof(buf), snprintf(buf, sizeof(buf),
"%s %u", sep, id); "%s %u", sep, id);
@@ -3835,9 +3867,8 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section,
ADD_STRING(target, "\n"); ADD_STRING(target, "\n");
continue; continue;
} }
} else if (optcode == DNS_OPT_EDE) { break;
INDENT(style); case DNS_OPT_EDE:
ADD_STRING(target, "EDE:");
if (optlen >= 2U) { if (optlen >= 2U) {
uint16_t ede; uint16_t ede;
ADD_STRING(target, "\n"); ADD_STRING(target, "\n");
@@ -3862,44 +3893,40 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section,
extra_text = true; extra_text = true;
} }
} }
} else if (optcode == DNS_OPT_CLIENT_TAG) { break;
uint16_t id; case DNS_OPT_CLIENT_TAG:
INDENT(style);
ADD_STRING(target, "CLIENT-TAG:");
if (optlen == 2U) { if (optlen == 2U) {
id = isc_buffer_getuint16(&optbuf); uint16_t id =
isc_buffer_getuint16(&optbuf);
snprintf(buf, sizeof(buf), " %u\n", id); snprintf(buf, sizeof(buf), " %u\n", id);
ADD_STRING(target, buf); ADD_STRING(target, buf);
continue; continue;
} }
} else if (optcode == DNS_OPT_SERVER_TAG) { break;
uint16_t id; case DNS_OPT_SERVER_TAG:
INDENT(style);
ADD_STRING(target, "SERVER-TAG:");
if (optlen == 2U) { if (optlen == 2U) {
id = isc_buffer_getuint16(&optbuf); uint16_t id =
isc_buffer_getuint16(&optbuf);
snprintf(buf, sizeof(buf), " %u\n", id); snprintf(buf, sizeof(buf), " %u\n", id);
ADD_STRING(target, buf); ADD_STRING(target, buf);
continue; continue;
} }
} else if (optcode == DNS_OPT_REPORT_CHANNEL) { break;
INDENT(style); case DNS_OPT_REPORT_CHANNEL:
ADD_STRING(target, "Report-Channel:");
if (optlen > 0U) { if (optlen > 0U) {
isc_buffer_t sb = optbuf; isc_buffer_t sb = optbuf;
isc_buffer_setactive(&optbuf, optlen); isc_buffer_setactive(&optbuf, optlen);
result = render_reportchan(&optbuf, result = render_nameopt(&optbuf,
target); target);
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
ADD_STRING(target, "\n");
continue; continue;
} }
optbuf = sb; optbuf = sb;
} }
} else { break;
INDENT(style); default:
ADD_STRING(target, "OPT="); break;
snprintf(buf, sizeof(buf), "%u:", optcode);
ADD_STRING(target, buf);
} }
if (optlen != 0) { if (optlen != 0) {
@@ -4048,7 +4075,8 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section,
dns_rdata_t rdata; dns_rdata_t rdata;
isc_buffer_t optbuf; isc_buffer_t optbuf;
uint16_t optcode, optlen; uint16_t optcode, optlen;
unsigned char *optdata; unsigned char *optdata = NULL;
isc_buffer_t ecsbuf;
REQUIRE(DNS_MESSAGE_VALID(msg)); REQUIRE(DNS_MESSAGE_VALID(msg));
REQUIRE(target != NULL); REQUIRE(target != NULL);
@@ -4110,6 +4138,8 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section,
isc_buffer_init(&optbuf, rdata.data, rdata.length); isc_buffer_init(&optbuf, rdata.data, rdata.length);
isc_buffer_add(&optbuf, rdata.length); isc_buffer_add(&optbuf, rdata.length);
while (isc_buffer_remaininglength(&optbuf) != 0) { while (isc_buffer_remaininglength(&optbuf) != 0) {
const char *option_name = NULL;
INSIST(isc_buffer_remaininglength(&optbuf) >= 4U); INSIST(isc_buffer_remaininglength(&optbuf) >= 4U);
optcode = isc_buffer_getuint16(&optbuf); optcode = isc_buffer_getuint16(&optbuf);
optlen = isc_buffer_getuint16(&optbuf); optlen = isc_buffer_getuint16(&optbuf);
@@ -4117,9 +4147,20 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section,
INSIST(isc_buffer_remaininglength(&optbuf) >= optlen); INSIST(isc_buffer_remaininglength(&optbuf) >= optlen);
INDENT(style); INDENT(style);
ADD_STRING(target, "; ");
if (optcode < ARRAY_SIZE(option_names)) {
option_name = option_names[optcode];
}
if (option_name != NULL) {
ADD_STRING(target, option_names[optcode])
} else {
snprintf(buf, sizeof(buf), "OPT=%u", optcode);
ADD_STRING(target, buf);
}
ADD_STRING(target, ":");
if (optcode == DNS_OPT_LLQ) { switch (optcode) {
ADD_STRING(target, "; LLQ:"); case DNS_OPT_LLQ:
if (optlen == 18U) { if (optlen == 18U) {
result = render_llq(&optbuf, target); result = render_llq(&optbuf, target);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
@@ -4128,8 +4169,8 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section,
ADD_STRING(target, "\n"); ADD_STRING(target, "\n");
continue; continue;
} }
} else if (optcode == DNS_OPT_UL) { break;
ADD_STRING(target, "; UL:"); case DNS_OPT_UL:
if (optlen == 4U || optlen == 8U) { if (optlen == 4U || optlen == 8U) {
uint32_t secs, key = 0; uint32_t secs, key = 0;
secs = isc_buffer_getuint32(&optbuf); secs = isc_buffer_getuint32(&optbuf);
@@ -4160,14 +4201,8 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section,
ADD_STRING(target, ")\n"); ADD_STRING(target, ")\n");
continue; continue;
} }
} else if (optcode == DNS_OPT_NSID) { break;
ADD_STRING(target, "; NSID:"); case DNS_OPT_CLIENT_SUBNET:
} else if (optcode == DNS_OPT_COOKIE) {
ADD_STRING(target, "; COOKIE:");
} else if (optcode == DNS_OPT_CLIENT_SUBNET) {
isc_buffer_t ecsbuf;
ADD_STRING(target, "; CLIENT-SUBNET:");
isc_buffer_init(&ecsbuf, isc_buffer_init(&ecsbuf,
isc_buffer_current(&optbuf), isc_buffer_current(&optbuf),
optlen); optlen);
@@ -4181,8 +4216,8 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section,
ADD_STRING(target, "\n"); ADD_STRING(target, "\n");
continue; continue;
} }
} else if (optcode == DNS_OPT_EXPIRE) { break;
ADD_STRING(target, "; EXPIRE:"); case DNS_OPT_EXPIRE:
if (optlen == 4) { if (optlen == 4) {
uint32_t secs; uint32_t secs;
secs = isc_buffer_getuint32(&optbuf); secs = isc_buffer_getuint32(&optbuf);
@@ -4197,8 +4232,8 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section,
ADD_STRING(target, ")\n"); ADD_STRING(target, ")\n");
continue; continue;
} }
} else if (optcode == DNS_OPT_TCP_KEEPALIVE) { break;
ADD_STRING(target, "; TCP KEEPALIVE:"); case DNS_OPT_TCP_KEEPALIVE:
if (optlen == 2) { if (optlen == 2) {
unsigned int dsecs; unsigned int dsecs;
dsecs = isc_buffer_getuint16(&optbuf); dsecs = isc_buffer_getuint16(&optbuf);
@@ -4208,8 +4243,8 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section,
ADD_STRING(target, " secs\n"); ADD_STRING(target, " secs\n");
continue; continue;
} }
} else if (optcode == DNS_OPT_PAD) { break;
ADD_STRING(target, "; PAD:"); case DNS_OPT_PAD:
if (optlen > 0U) { if (optlen > 0U) {
snprintf(buf, sizeof(buf), snprintf(buf, sizeof(buf),
" (%u bytes)", optlen); " (%u bytes)", optlen);
@@ -4218,13 +4253,26 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section,
} }
ADD_STRING(target, "\n"); ADD_STRING(target, "\n");
continue; continue;
} else if (optcode == DNS_OPT_KEY_TAG) { case DNS_OPT_CHAIN:
ADD_STRING(target, "; KEY-TAG:"); if (optlen > 0U) {
isc_buffer_t sb = optbuf;
isc_buffer_setactive(&optbuf, optlen);
result = render_nameopt(&optbuf,
target);
if (result == ISC_R_SUCCESS) {
ADD_STRING(target, "\n");
continue;
}
optbuf = sb;
}
ADD_STRING(target, "\n");
break;
case DNS_OPT_KEY_TAG:
if (optlen > 0U && (optlen % 2U) == 0U) { if (optlen > 0U && (optlen % 2U) == 0U) {
const char *sep = ""; const char *sep = "";
uint16_t id;
while (optlen > 0U) { while (optlen > 0U) {
id = isc_buffer_getuint16( uint16_t id =
isc_buffer_getuint16(
&optbuf); &optbuf);
snprintf(buf, sizeof(buf), snprintf(buf, sizeof(buf),
"%s %u", sep, id); "%s %u", sep, id);
@@ -4235,8 +4283,8 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section,
ADD_STRING(target, "\n"); ADD_STRING(target, "\n");
continue; continue;
} }
} else if (optcode == DNS_OPT_EDE) { break;
ADD_STRING(target, "; EDE:"); case DNS_OPT_EDE:
if (optlen >= 2U) { if (optlen >= 2U) {
uint16_t ede; uint16_t ede;
ede = isc_buffer_getuint16(&optbuf); ede = isc_buffer_getuint16(&optbuf);
@@ -4264,30 +4312,30 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section,
ADD_STRING(target, buf); ADD_STRING(target, buf);
continue; continue;
} }
} else if (optcode == DNS_OPT_CLIENT_TAG) { break;
uint16_t id; case DNS_OPT_CLIENT_TAG:
ADD_STRING(target, "; CLIENT-TAG:");
if (optlen == 2U) { if (optlen == 2U) {
id = isc_buffer_getuint16(&optbuf); uint16_t id =
isc_buffer_getuint16(&optbuf);
snprintf(buf, sizeof(buf), " %u\n", id); snprintf(buf, sizeof(buf), " %u\n", id);
ADD_STRING(target, buf); ADD_STRING(target, buf);
continue; continue;
} }
} else if (optcode == DNS_OPT_SERVER_TAG) { break;
uint16_t id; case DNS_OPT_SERVER_TAG:
ADD_STRING(target, "; SERVER-TAG:");
if (optlen == 2U) { if (optlen == 2U) {
id = isc_buffer_getuint16(&optbuf); uint16_t id =
isc_buffer_getuint16(&optbuf);
snprintf(buf, sizeof(buf), " %u\n", id); snprintf(buf, sizeof(buf), " %u\n", id);
ADD_STRING(target, buf); ADD_STRING(target, buf);
continue; continue;
} }
} else if (optcode == DNS_OPT_REPORT_CHANNEL) { break;
ADD_STRING(target, "; Report-Channel:"); case DNS_OPT_REPORT_CHANNEL:
if (optlen > 0U) { if (optlen > 0U) {
isc_buffer_t sb = optbuf; isc_buffer_t sb = optbuf;
isc_buffer_setactive(&optbuf, optlen); isc_buffer_setactive(&optbuf, optlen);
result = render_reportchan(&optbuf, result = render_nameopt(&optbuf,
target); target);
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {
ADD_STRING(target, "\n"); ADD_STRING(target, "\n");
@@ -4295,10 +4343,9 @@ dns_message_pseudosectiontotext(dns_message_t *msg, dns_pseudosection_t section,
} }
optbuf = sb; optbuf = sb;
} }
} else { break;
ADD_STRING(target, "; OPT="); default:
snprintf(buf, sizeof(buf), "%u:", optcode); break;
ADD_STRING(target, buf);
} }
if (optlen != 0) { if (optlen != 0) {