diff options
| author | Francis Dupont <fdupont@isc.org> | 2017-12-23 01:18:23 +0100 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2017-12-23 01:18:23 +0100 |
| commit | 563f0b8aef9558a900f215dfccc571eab99a0223 (patch) | |
| tree | 4d5ce8719fe415d089569f5f98ca84c944a42aaf /common/tables.c | |
| parent | 0d6d300fec8b26c9e854095a4a29158186b69172 (diff) | |
| download | isc-dhcp-563f0b8aef9558a900f215dfccc571eab99a0223.tar.gz | |
Merged rt44535 (relay port)
Diffstat (limited to 'common/tables.c')
| -rw-r--r-- | common/tables.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/common/tables.c b/common/tables.c index 2350e803..b3d5ae66 100644 --- a/common/tables.c +++ b/common/tables.c @@ -557,12 +557,6 @@ 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 /* RFC7341 OPTIONS */ #if defined(RFC7341_OPTIONS) @@ -570,6 +564,16 @@ static struct option dhcpv6_options[] = { { "dhcp4-o-dhcp6-server", "6A", &dhcpv6_universe, 88, 1 }, #endif +#if defined(RFC7710_OPTIONS) + { "v6-captive-portal", "t", &dhcpv6_universe, 103, 1 }, +#endif + + { "relay-source-port", "S", &dhcpv6_universe, 135, 1 }, + +#if defined(RFC6153_OPTIONS) + { "ipv6-address-andsf", "6A", &dhcpv6_universe, 143, 1 }, +#endif + { NULL, NULL, NULL, 0, 0 } }; |