mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

Use YAML comments for durations rather than parentheses

Browse Source 
This will allow the values to be parsed using standard yaml processing
tools, and still provide the value in a human friendly form.
This commit is contained in:
Mark Andrews
2024-10-31 16:52:11 +11:00
parent 68cdc4774c
commit 378bc7cfa6
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bin/tests/system/digdelv/tests.sh
View File

@@ -578,7 +578,8 @@ if [ -x "$DIG" ]; then
dig_with_opts @10.53.0.3 +yaml +ednsopt=UPDATE-LEASE:00000e10 +qr a.example >dig.out.test$n 2>&1 || ret=1 dig_with_opts @10.53.0.3 +yaml +ednsopt=UPDATE-LEASE:00000e10 +qr a.example >dig.out.test$n 2>&1 || ret=1
$PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS UPDATE-LEASE LEASE >yamlget.out.test$n 2>&1 || ret=1 $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS UPDATE-LEASE LEASE >yamlget.out.test$n 2>&1 || ret=1
read -r value <yamlget.out.test$n read -r value <yamlget.out.test$n
[ "$value" = "3600 (1 hour)" ] || ret=1 [ "$value" = "3600" ] || ret=1
grep "LEASE: 3600 # 1 hour" dig.out.test$n >/dev/null || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
fi fi
@@ -599,10 +600,12 @@ if [ -x "$DIG" ]; then
dig_with_opts @10.53.0.3 +yaml +ednsopt=UPDATE-LEASE:00000e1000127500 +qr a.example >dig.out.test$n 2>&1 || ret=1 dig_with_opts @10.53.0.3 +yaml +ednsopt=UPDATE-LEASE:00000e1000127500 +qr a.example >dig.out.test$n 2>&1 || ret=1
$PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS UPDATE-LEASE LEASE >yamlget.out.test$n 2>&1 || ret=1 $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS UPDATE-LEASE LEASE >yamlget.out.test$n 2>&1 || ret=1
read -r value <yamlget.out.test$n read -r value <yamlget.out.test$n
[ "$value" = "3600 (1 hour)" ] || ret=1 [ "$value" = "3600" ] || ret=1
grep "LEASE: 3600 # 1 hour" dig.out.test$n >/dev/null || ret=1
$PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS UPDATE-LEASE KEY-LEASE >yamlget.out.test$n 2>&1 || ret=1 $PYTHON yamlget.py dig.out.test$n 0 message query_message_data OPT_PSEUDOSECTION EDNS UPDATE-LEASE KEY-LEASE >yamlget.out.test$n 2>&1 || ret=1
read -r value <yamlget.out.test$n read -r value <yamlget.out.test$n
[ "$value" = "1209600 (2 weeks)" ] || ret=1 [ "$value" = "1209600" ] || ret=1
grep "KEY-LEASE: 1209600 # 2 weeks" dig.out.test$n >/dev/null || ret=1
if [ $ret -ne 0 ]; then echo_i "failed"; fi if [ $ret -ne 0 ]; then echo_i "failed"; fi
status=$((status + ret)) status=$((status + ret))
fi fi

14
lib/dns/message.c
View File

@@ -3720,18 +3720,17 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section,
snprintf(buf, sizeof(buf), " %u", secs); snprintf(buf, sizeof(buf), " %u", secs);
ADD_STRING(target, buf); ADD_STRING(target, buf);
ADD_STRING(target, " ("); ADD_STRING(target, " # ");
result = dns_ttl_totext(secs, true, result = dns_ttl_totext(secs, true,
true, target); true, target);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
goto cleanup; goto cleanup;
} }
ADD_STRING(target, ")"); ADD_STRING(target, "\n");
if (optlen == 8U) { if (optlen == 8U) {
key = isc_buffer_getuint32( key = isc_buffer_getuint32(
&optbuf); &optbuf);
ADD_STRING(target, "\n");
INDENT(style); INDENT(style);
ADD_STRING(target, ADD_STRING(target,
"KEY-LEASE:"); "KEY-LEASE:");
@@ -3739,16 +3738,15 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section,
" %u", key); " %u", key);
ADD_STRING(target, buf); ADD_STRING(target, buf);
ADD_STRING(target, " ("); ADD_STRING(target, " # ");
result = dns_ttl_totext( result = dns_ttl_totext(
key, true, true, key, true, true,
target); target);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
goto cleanup; goto cleanup;
} }
ADD_STRING(target, ")"); ADD_STRING(target, "\n");
} }
ADD_STRING(target, "\n");
continue; continue;
} }
break; break;
@@ -3774,13 +3772,13 @@ dns_message_pseudosectiontoyaml(dns_message_t *msg, dns_pseudosection_t section,
secs = isc_buffer_getuint32(&optbuf); secs = isc_buffer_getuint32(&optbuf);
snprintf(buf, sizeof(buf), " %u", secs); snprintf(buf, sizeof(buf), " %u", secs);
ADD_STRING(target, buf); ADD_STRING(target, buf);
ADD_STRING(target, " ("); ADD_STRING(target, " # ");
result = dns_ttl_totext(secs, true, result = dns_ttl_totext(secs, true,
true, target); true, target);
if (result != ISC_R_SUCCESS) { if (result != ISC_R_SUCCESS) {
goto cleanup; goto cleanup;
} }
ADD_STRING(target, ")\n"); ADD_STRING(target, "\n");
continue; continue;
} }
break; break;