4330. [protocol] Identify the PAD option as "PAD" when printing out

a message.

(cherry picked from commit 33a4294f44)
This commit is contained in:
Mark Andrews
2016-03-10 16:53:06 +11:00
parent 335626b5dc
commit 927e9d8bbc
3 changed files with 10 additions and 4 deletions

View File

@@ -1,3 +1,6 @@
4330. [protocol] Identify the PAD option as "PAD" when printing out
a message.
--- 9.9.9b1 released ---
4329. [func] Warn about a common misconfiguration when forwarding

View File

@@ -102,10 +102,11 @@
#define DNS_MESSAGEEXTFLAG_DO 0x8000U
/*%< EDNS0 extended OPT codes */
#define DNS_OPT_NSID 0x0003 /*%< NSID opt code */
#define DNS_OPT_CLIENT_SUBNET 0x0008 /*%< client subnet opt code */
#define DNS_OPT_EXPIRE 0x0009 /*%< EXPIRE opt code */
#define DNS_OPT_COOKIE 0x000a /*%< COOKIE opt code */
#define DNS_OPT_NSID 3 /*%< NSID opt code */
#define DNS_OPT_CLIENT_SUBNET 8 /*%< client subnet opt code */
#define DNS_OPT_EXPIRE 9 /*%< EXPIRE opt code */
#define DNS_OPT_COOKIE 10 /*%< COOKIE opt code */
#define DNS_OPT_PAD 12 /*%< PAD opt code */
/*%< The number of EDNS options we know about. */
#define DNS_EDNSOPTIONS 4

View File

@@ -3295,6 +3295,8 @@ dns_message_pseudosectiontotext(dns_message_t *msg,
continue;
}
ADD_STRING(target, "; EXPIRE");
} else if (optcode == DNS_OPT_PAD) {
ADD_STRING(target, "; PAD");
} else {
ADD_STRING(target, "; OPT=");
snprintf(buf, sizeof(buf), "%u", optcode);