diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2018-02-14 14:58:07 +0100 |
|---|---|---|
| committer | Hans Dedecker <dedeckeh@gmail.com> | 2018-02-24 21:03:31 +0100 |
| commit | 66222dd92b3bdb0f035a4ab0370796cfdcdf8593 (patch) | |
| tree | 5648dddd857867d96021d538febbafed94d9b836 /package/network/ipv6/odhcp6c/files/dhcpv6.sh | |
| parent | 0f54d96d241dd3fb528ca14d9c0e6b799001feb6 (diff) | |
| download | upstream-66222dd92b3bdb0f035a4ab0370796cfdcdf8593.tar.gz upstream-66222dd92b3bdb0f035a4ab0370796cfdcdf8593.tar.bz2 upstream-66222dd92b3bdb0f035a4ab0370796cfdcdf8593.zip | |
odhcp6c: support multiple additional user prefixes
Support configuration in the form...
list ip6prefix 2001:db8:1234::/64
list ip6prefix 2001:db8:5678::/64
... to allow specifying multiple additional IPv6 prefixes.
Implements feature request FS#1361.
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Diffstat (limited to 'package/network/ipv6/odhcp6c/files/dhcpv6.sh')
| -rwxr-xr-x | package/network/ipv6/odhcp6c/files/dhcpv6.sh | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh index 5c2ee6b988..54e51065f6 100755 --- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh @@ -16,7 +16,7 @@ proto_dhcpv6_init_config() { proto_config_add_string 'forceprefix:bool' proto_config_add_string 'extendprefix:bool' proto_config_add_string 'norelease:bool' - proto_config_add_string 'ip6prefix:ip6addr' + proto_config_add_array 'ip6prefix:list(ip6addr)' proto_config_add_string iface_dslite proto_config_add_string zone_dslite proto_config_add_string iface_map @@ -36,12 +36,17 @@ proto_dhcpv6_init_config() { proto_config_add_int "ra_holdoff" } +proto_dhcpv6_add_prefix() { + append "$3" "$1" +} + proto_dhcpv6_setup() { local config="$1" local iface="$2" - local reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass sendopts delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff - json_get_vars reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff + local reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease ip6prefix ip6prefixes iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass sendopts delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff + json_get_vars reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff + json_for_each_item proto_dhcpv6_add_prefix ip6prefix ip6prefixes # Configure local opts="" @@ -84,7 +89,7 @@ proto_dhcpv6_setup() { append opts "-t${soltimeout:-120}" - [ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix" + [ -n "$ip6prefixes" ] && proto_export "USERPREFIX=$ip6prefixes" [ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite" [ -n "$iface_map" ] && proto_export "IFACE_MAP=$iface_map" [ -n "$iface_464xlat" ] && proto_export "IFACE_464XLAT=$iface_464xlat" |