[#3141] provide RFC in comments

diff --git a/doc/examples/kea4/all-options.json b/doc/examples/kea4/all-options.json
index 76f640ab2b3061cbd3a06245fb183537ae1a40a2..19694023d8f99e2b03c7e608582c4880deaaada1 100644 (file)
--- a/doc/examples/kea4/all-options.json
+++ b/doc/examples/kea4/all-options.json
@@ -1611,7 +1611,7 @@
       Service Priority:  The priority of this instance compared to other
          DNR instances.  This 16-bit unsigned integer is interpreted
          following the rules specified in Section 2.4.1 of
-         [I-D.ietf-dnsop-svcb-https].
+         [RFC9460].
 
       ADN Length:  Length of the authentication-domain-name in octets.
 
@@ -1628,7 +1628,7 @@
 
       Service Parameters (SvcParams) (variable length):  Specifies a set of
          service parameters that are encoded following the rules in
-         Section 2.1 of [I-D.ietf-dnsop-svcb-https].
+         Section 2.2 of [RFC9460].
          The length of this field is ('DNR Instance Data Length' - 4 - 'ADN
          Length' - 'Addr Length').
 

diff --git a/doc/examples/kea4/dnr.json b/doc/examples/kea4/dnr.json
index eda26e6b6a7136e0540d126be62de4d0086895a1..5825c30f90cce9d977ef2a41f6d067a7b225aa6c 100644 (file)
--- a/doc/examples/kea4/dnr.json
+++ b/doc/examples/kea4/dnr.json
@@ -1,7 +1,7 @@
 // This is an example configuration file for the DHCPv4 server in Kea.
 // The purpose of this example is to showcase how to configure
 // DHCP option for the Discovery of Network-designated Resolvers (DNR)
-// (code 162) draft-ietf-add-dnr.
+// (code 162) RFC9463.
 
 
 {

diff --git a/doc/examples/kea6/all-options.json b/doc/examples/kea6/all-options.json
index bd38f40d943a91b29780539c976b26914cb7eb1f..01f7098848d4991e4a4d0a2a638af99f56f93381 100644 (file)
--- a/doc/examples/kea6/all-options.json
+++ b/doc/examples/kea6/all-options.json
@@ -1795,7 +1795,7 @@
       Service Priority:  The priority of this OPTION_V6_DNR instance
          compared to other instances.  This 16-bit unsigned integer is
          interpreted following the rules specified in Section 2.4.1 of
-         [I-D.ietf-dnsop-svcb-https].
+         [RFC9460].
 
       ADN Length:  Length of the authentication-domain-name field in
          octets.
@@ -1813,7 +1813,7 @@
 
       Service Parameters (SvcParams) (variable length):  Specifies a set of
          service parameters that are encoded following the rules in
-         Section 2.1 of [I-D.ietf-dnsop-svcb-https].
+         Section 2.2 of [RFC9460].
       */
       // Type: uint16, uint16, FQDN, binary
       {

diff --git a/doc/examples/kea6/dnr.json b/doc/examples/kea6/dnr.json
index 48893f765d91ef7530d8b510890479308623d06e..f27fd68305c459ccaf2a028326243495e2e88951 100644 (file)
--- a/doc/examples/kea6/dnr.json
+++ b/doc/examples/kea6/dnr.json
@@ -1,7 +1,7 @@
 // This is an example configuration file for the DHCPv6 server in Kea.
 // The purpose of this example is to showcase how to configure
 // DHCP option for the Discovery of Network-designated Resolvers (DNR)
-// (code 144) draft-ietf-add-dnr.
+// (code 144) RFC9463.
 {
   "Dhcp6": {
     // Option data defined globally

diff --git a/src/lib/dhcp/dhcp4.h b/src/lib/dhcp/dhcp4.h
index af14dae7f21e4f3d5daeae1e88d15f8dfef9110d..aa3ecee5be06a512b54cb499ca754aa803a1122d 100644 (file)
--- a/src/lib/dhcp/dhcp4.h
+++ b/src/lib/dhcp/dhcp4.h
@@ -215,7 +215,7 @@ enum DHCPOptionType {
     // 160 used to be assigned in RFC7710, but was removed in RFC8910
     // The Captive Portal option now uses code 114.
 //  DHO_MUD_URL_V4                   = 161, /* RFC8520 */
-    DHO_V4_DNR                       = 162, /* RFC-ietf-add-dnr */
+    DHO_V4_DNR                       = 162, /* RFC9463 */
     // 163-209 are removed/unassigned
 //  DHO_PATH_PREFIX                  = 210, /* RFC5071 */
 //  DHO_REBOOT_TIME                  = 211, /* RFC5071 */

diff --git a/src/lib/dhcp/dhcp6.h b/src/lib/dhcp/dhcp6.h
index bb89c20a87c6fcc27af10e2778d2efaa59934ec9..4ba3c71fa27ae12781d3bb6afd187d6d41367ba6 100644 (file)
--- a/src/lib/dhcp/dhcp6.h
+++ b/src/lib/dhcp/dhcp6.h
@@ -156,7 +156,7 @@ enum DHCPv6OptionType {
    D60_V6_SZTP_REDIRECT                   = 136, /* RFC8572 */
    // Option codes 137-142 are unassigned.
    D6O_IPV6_ADDRESS_ANDSF                 = 143, /* RFC6153 */
-   D6O_V6_DNR                             = 144 /* RFC-ietf-add-dnr */
+   D6O_V6_DNR                             = 144 /* RFC9463 */
 };
 
 /*

diff --git a/src/lib/dhcp/option4_dnr.cc b/src/lib/dhcp/option4_dnr.cc
index e2bc68424d8207c8c68cda544fe7a4f30886dec8..3564612a32dc516418c10b143ba8737279c3c716 100644 (file)
--- a/src/lib/dhcp/option4_dnr.cc
+++ b/src/lib/dhcp/option4_dnr.cc
@@ -421,7 +421,7 @@ DnrInstance::unpackAddresses(OptionBufferConstIter& begin, const OptionBufferCon
                                   << "Addr Len=" << addr_length_ << " is not divisible by 4");
     }
 
-    // As per draft-ietf-add-dnr 3.1.8:
+    // As per RFC9463 Section 3.1.8:
     // If additional data is supplied (i.e. not ADN only mode),
     // the option includes at least one valid IP address.
     if (addr_length_ == 0) {

diff --git a/src/lib/dhcp/option4_dnr.h b/src/lib/dhcp/option4_dnr.h
index 0db59e88083fa5a77a82e0006c80357ef9555041..a00232bf84f85b08402650548aa41e5b91f6b9fa 100644 (file)
--- a/src/lib/dhcp/option4_dnr.h
+++ b/src/lib/dhcp/option4_dnr.h
@@ -52,8 +52,7 @@ public:
 /// @c Option6Dnr class can derive from this @c DnrInstance class, whereas @c Option4Dnr class
 /// should have a container of @c DnrInstance's.
 ///
-/// DNR Instance Data Format has been defined in the @c draft-ietf-add-dnr (to be replaced
-/// with published RFC).
+/// DNR Instance Data Format has been defined in the @c RFC9463.
 class DnrInstance {
 public:
     /// @brief A Type defined for container holding IP addresses.
@@ -436,8 +435,7 @@ private:
 
 /// @brief Represents DHCPv4 Encrypted DNS %Option (code 162).
 ///
-/// This option has been defined in the @c draft-ietf-add-dnr (to be replaced
-/// with published RFC) and it has a following structure:
+/// This option has been defined in the @c RFC9463 and it has a following structure:
 /// - option-code = 162 (1 octet)
 /// - option-len (1 octet)
 /// - multiple (one or more) DNR Instance Data

diff --git a/src/lib/dhcp/option6_dnr.cc b/src/lib/dhcp/option6_dnr.cc
index f5fa1606960cc4a350978740e3ec60e2ad529c41..e232e376a5f1522fb12a6670aa7c5f75f43afe34 100644 (file)
--- a/src/lib/dhcp/option6_dnr.cc
+++ b/src/lib/dhcp/option6_dnr.cc
@@ -120,7 +120,7 @@ Option6Dnr::unpackAddresses(OptionBufferConstIter& begin, OptionBufferConstIter
                                   << "Addr Len=" << addr_length_ << " is not divisible by 16");
     }
 
-    // As per draft-ietf-add-dnr 3.1.8:
+    // As per RFC9463 3.1.8:
     // If additional data is supplied (i.e. not ADN only mode),
     // the option includes at least one valid IP address.
     if (addr_length_ == 0) {

diff --git a/src/lib/dhcp/option6_dnr.h b/src/lib/dhcp/option6_dnr.h
index e1cbcf743ec0afbf0c48253898bc7698807dc087..f8a8b4ef44a7b751bbf21522aef279244a07934d 100644 (file)
--- a/src/lib/dhcp/option6_dnr.h
+++ b/src/lib/dhcp/option6_dnr.h
@@ -14,8 +14,7 @@ namespace dhcp {
 
 /// @brief Represents DHCPv6 Encrypted DNS %Option (code 144).
 ///
-/// This option has been defined in the @c draft-ietf-add-dnr (to be replaced
-/// with published RFC) and it has a following structure:
+/// This option has been defined in the @c RFC9463 and it has a following structure:
 /// - option-code = 144 (2 octets)
 /// - option-len (2 octets)
 /// - Service Priority (2 octets)