3838. [protocol] EDNS EXPIRE as been assigned a code point of 9.

(cherry picked from commit cd07e4d038fda6f9bacecb3067cc6fa43a67fc0a)

diff --git a/CHANGES b/CHANGES
index 4da5318d094b514480a076881908ca574fd0824c..0ee26b513d5d99801afae806cca1f772e0e420c5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3838.  [protocol]      EDNS EXPIRE as been assigned a code point of 9.
+
 3837.  [security]      A NULL pointer is passed to query_prefetch resulting
                        a REQUIRE assertion failure when a fetch is actually
                        initiated.  [ RT #35899]

diff --git a/lib/dns/include/dns/message.h b/lib/dns/include/dns/message.h
index 013411fcc48cdfa7a6efa7d3d6112e2fcc5b8362..de121c764d38ce3b1298c55419aaf8c2b3b88a99 100644 (file)
--- a/lib/dns/include/dns/message.h
+++ b/lib/dns/include/dns/message.h
@@ -106,9 +106,10 @@
 /*%< 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 */
+
 /*%< Experimental options [65001...65534] as per RFC6891 */
 #define DNS_OPT_SIT            65001           /*%< SIT opt code */
-#define DNS_OPT_EXPIRE         65002           /*%< EXPIRE opt code */
 
 /*%< The number of EDNS options we know about. */
 #define DNS_EDNSOPTIONS        4