[master] Add some more options form older RFCS

diff --git a/RELNOTES b/RELNOTES
index d14f9a84e8eb515d97ea9f46ef88710d88b5001d..997dae330c20262358b9a3dc052cbb07be3df957 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -156,6 +156,7 @@ by Eric Young (eay@cryptsoft.com).
 
 - Add definitions for some options that have been specified by the IETF.
   [ISC-Bugs #29268]
+  [ISC-Bugs #35198]
 
                        Changes since 4.3.0b1
 

diff --git a/common/tables.c b/common/tables.c
index 7d97cb003bac05cf71837f8c4dbf401f69e04012..6cbfe25c00b0105e8b8f5082344d26e4eb6a52dc 100644 (file)
--- a/common/tables.c
+++ b/common/tables.c
@@ -205,6 +205,9 @@ static struct option dhcp_options[] = {
        { "pxe-client-id", "BX",                &dhcp_universe,  97, 1 },
 #endif
        { "uap-servers", "t",                   &dhcp_universe,  98, 1 },
+#if defined(RFC4776_OPTIONS)
+        { "geoconf-civic", "X",                 &dhcp_universe, 99, 1 },
+#endif
 #if defined(RFC4833_OPTIONS)
        { "pcode", "t",                         &dhcp_universe, 100, 1 },
        { "tcode", "t",                         &dhcp_universe, 101, 1 },
@@ -212,6 +215,9 @@ static struct option dhcp_options[] = {
        { "netinfo-server-address", "Ia",       &dhcp_universe, 112, 1 },
        { "netinfo-server-tag", "t",            &dhcp_universe, 113, 1 },
        { "default-url", "t",                   &dhcp_universe, 114, 1 },
+#if defined(RFC2937_OPTIONS)
+       { "name-service-search", "Sa",          &dhcp_universe, 117, 1 },
+#endif
        { "subnet-selection", "I",              &dhcp_universe, 118, 1 },
        { "domain-search", "Dc",                &dhcp_universe, 119, 1 },
        { "vivco", "Evendor-class.",            &dhcp_universe, 124, 1 },
@@ -239,6 +245,9 @@ static struct option dhcp_options[] = {
 #if defined(RFC5417_OPTIONS)
        {"capwap-ac-v4", "Ia",                  &dhcp_universe, 138, 1 },
 #endif
+#if defined(RFC6731_OPTIONS)
+        { "rdnss-selection", "BIID",           &dhcp_universe, 146, 1 },
+#endif
 #if 0
        /* Not defined by RFC yet */
        { "tftp-server-address", "Ia",          &dhcp_universe, 150, 1 },
@@ -250,6 +259,9 @@ static struct option dhcp_options[] = {
        { "loader-pathprefix", "t",             &dhcp_universe, 210, 1 },
        { "loader-reboottime", "L",             &dhcp_universe, 211, 1 },
 #endif
+#if defined(RFC5969_OPTIONS)
+        { "option-6rd", "BB6Ia",               &dhcp_universe, 212, 1 },
+#endif
 #if defined(RFC5986_OPTIONS)
        {"v4-access-domain", "d",               &dhcp_universe, 213, 1 },
 #endif

diff --git a/includes/site.h b/includes/site.h
index 2b728b43c93f43e37071672b517c2e74f031211b..72953626cea06347d16ae78cf8602bcac8b2ca87 100644 (file)
--- a/includes/site.h
+++ b/includes/site.h
@@ -299,6 +299,7 @@
    should be left as is, but if you have already defined one
    of these and prefer your definition you can comment the 
    RFC define out to avoid conflicts */
+#define RFC2937_OPTIONS
 #define RFC4776_OPTIONS
 #define RFC4833_OPTIONS
 #define RFC4994_OPTIONS
@@ -306,6 +307,7 @@
 #define RFC5223_OPTIONS
 #define RFC5417_OPTIONS
 #define RFC5460_OPTIONS
+#define RFC5969_OPTIONS
 #define RFC5970_OPTIONS
 #define RFC5986_OPTIONS
 #define RFC6011_OPTIONS