summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorShawn Routhier <sar@isc.org>2016-01-29 10:51:18 -0800
committerShawn Routhier <sar@isc.org>2016-01-29 10:51:18 -0800
commit1bfdeaaee92505c2bf9bb3cc525369ec10c6bf3e (patch)
tree9e5c79618451877f61520b0fdd071de78a8e4490 /common
parenta6ed1aa89583ac9809340e6c673c154668114720 (diff)
downloadisc-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
Diffstat (limited to 'common')
-rw-r--r--common/tables.c21
1 files changed, 21 insertions, 0 deletions
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 }
};