]> git.ipfire.org Git - thirdparty/dhcp.git/commitdiff
Revert last commit
authorFrancis Dupont <fdupont@isc.org>
Wed, 30 Sep 2020 13:14:16 +0000 (15:14 +0200)
committerFrancis Dupont <fdupont@isc.org>
Wed, 30 Sep 2020 13:14:16 +0000 (15:14 +0200)
common/tables.c
includes/dhcp.h
includes/site.h
keama/options.c

index 0d73500494d0c9a2098628f6a82f4026a73fedbd..50d9cf10de3656048982ca612f190af8d4dc5781 100644 (file)
@@ -208,9 +208,6 @@ static struct option dhcp_options[] = {
 #if defined(RFC4833_OPTIONS)
        { "pcode", "t",                         &dhcp_universe, 100, 1 },
        { "tcode", "t",                         &dhcp_universe, 101, 1 },
-#endif
-#if defined(RFC8925_OPTIONS)
-       { "v6-only-preferred", "L",             &dhcp_universe, 108, 1 },
 #endif
        { "netinfo-server-address", "Ia",       &dhcp_universe, 112, 1 },
        { "netinfo-server-tag", "t",            &dhcp_universe, 113, 1 },
index 8431692405ff3d86c6ea0866dfa3b4669dc7301f..0a74137e055c0c0a0d28ba6623892c72b533c28f 100644 (file)
@@ -156,7 +156,6 @@ struct dhcp_packet {
 #define DHO_AUTHENTICATE                       90  /* RFC3118, was 210 */
 #define DHO_CLIENT_LAST_TRANSACTION_TIME       91
 #define DHO_ASSOCIATED_IP                      92
-#define DHO_V6_ONLY_PREFERRED                  108 /* RFC8925 */
 #define DHO_SUBNET_SELECTION                   118 /* RFC3011! */
 #define DHO_DOMAIN_SEARCH                      119 /* RFC3397 */
 #define DHO_VIVCO_SUBOPTIONS                   124
index 533e762bd6d4b7bab5d766613175f123a618eae0..2ef69e415e6aa6eb6d3589d3c7228953920de3b6 100644 (file)
 #define RFC7341_OPTIONS
 #define RFC7618_OPTIONS
 #define RFC7710_OPTIONS
-#define RFC8925_OPTIONS
index 7d1e66ea082cfd874eba5a20c72f17372bc189da..3f714108ff8e7cc33424c746b922ef7e8c358483 100644 (file)
@@ -170,7 +170,6 @@ struct option_def options4[] = {
         { "geoconf-civic", "X",                 "dhcp",  99, 2},
        { "pcode", "t",                         "dhcp", 100, 2},
        { "tcode", "t",                         "dhcp", 101, 2},
-       { "v6-only-preferred", "L",             "dhcp", 108, 2},
        { "netinfo-server-address", "Ia",       "dhcp", 112, 2},
        { "netinfo-server-tag", "t",            "dhcp", 113, 2},
        { "default-url", "t",                   "dhcp", 114, 2},