diff options
| author | Shawn Routhier <sar@isc.org> | 2016-01-29 10:51:18 -0800 |
|---|---|---|
| committer | Shawn Routhier <sar@isc.org> | 2016-01-29 10:51:18 -0800 |
| commit | 1bfdeaaee92505c2bf9bb3cc525369ec10c6bf3e (patch) | |
| tree | 9e5c79618451877f61520b0fdd071de78a8e4490 | |
| parent | a6ed1aa89583ac9809340e6c673c154668114720 (diff) | |
| download | isc-dhcp-1bfdeaaee92505c2bf9bb3cc525369ec10c6bf3e.tar.gz | |
[master] Add new options
options for v4: 116, 141, 142, 159, 160
options for v6: 103, 143
from rfcs: 2563, 6011, 6153, 7618, 7710
| -rw-r--r-- | RELNOTES | 3 | ||||
| -rw-r--r-- | common/tables.c | 21 | ||||
| -rw-r--r-- | includes/site.h | 6 |
3 files changed, 29 insertions, 1 deletions
@@ -192,6 +192,9 @@ by Eric Young (eay@cryptsoft.com). for cross compilation. [ISC-Bugs #33835] +- Add more option definitions. + [ISC-Bugs #40562] + Changes since 4.3.3b1 - None diff --git a/common/tables.c b/common/tables.c index 7508cd61..1c9360cb 100644 --- a/common/tables.c +++ b/common/tables.c @@ -209,6 +209,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(RFC2563_OPTIONS) + { "auto-config", "B", &dhcp_universe, 116, 1 }, +#endif #if defined(RFC2937_OPTIONS) { "name-service-search", "Sa", &dhcp_universe, 117, 1 }, #endif @@ -239,6 +242,12 @@ static struct option dhcp_options[] = { #if defined(RFC5417_OPTIONS) {"capwap-ac-v4", "Ia", &dhcp_universe, 138, 1 }, #endif +#if defined(RFC6011_OPTIONS) + { "sip-ua-cs-domains", "Dc", &dhcp_universe, 141, 1 }, +#endif +#if defined(RFC6153_OPTIONS) + { "ipv4-address-andsf", "IA", &dhcp_universe, 142, 1 }, +#endif #if defined(RFC6731_OPTIONS) { "rdnss-selection", "BIID", &dhcp_universe, 146, 1 }, #endif @@ -246,6 +255,12 @@ static struct option dhcp_options[] = { /* Not defined by RFC yet */ { "tftp-server-address", "Ia", &dhcp_universe, 150, 1 }, #endif +#if defined(RFC7618_OPTIONS) + { "v4-portparams", "BBS", &dhcp_universe, 159, 1 }, +#endif +#if defined(RFC7710_OPTIONS) + { "v4-captive-portal", "t", &dhcp_universe, 160, 1 }, +#endif #if 0 /* PXELINUX options: defined by RFC 5071 */ { "pxelinux-magic", "BBBB", &dhcp_universe, 208, 1 }, @@ -543,6 +558,12 @@ static struct option dhcpv6_options[] = { { "solmax-rt", "L", &dhcpv6_universe, 82, 1 }, { "inf-max-rt", "L", &dhcpv6_universe, 83, 1 }, #endif +#if defined(RFC7710_OPTIONS) + { "v6-captive-portal", "t", &dhcpv6_universe, 103, 1 }, +#endif +#if defined(RFC6153_OPTIONS) + { "ipv6-address-andsf", "6A", &dhcpv6_universe, 143, 1 }, +#endif { NULL, NULL, NULL, 0, 0 } }; diff --git a/includes/site.h b/includes/site.h index a36e322c..0586717e 100644 --- a/includes/site.h +++ b/includes/site.h @@ -316,6 +316,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 RFC2563_OPTIONS #define RFC2937_OPTIONS #define RFC4776_OPTIONS #define RFC4833_OPTIONS @@ -328,10 +329,13 @@ #define RFC5970_OPTIONS #define RFC5986_OPTIONS #define RFC6011_OPTIONS +#define RFC6011_OPTIONS +#define RFC6153_OPTIONS #define RFC6334_OPTIONS #define RFC6440_OPTIONS #define RFC6731_OPTIONS #define RFC6939_OPTIONS #define RFC6977_OPTIONS #define RFC7083_OPTIONS - +#define RFC7618_OPTIONS +#define RFC7710_OPTIONS |