odhcp6c: add noserverunicast config option for broken DHCPv6 servers

[openwrt/openwrt.git] / package / network / ipv6 / odhcp6c / files / dhcpv6.sh

diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
index bc7f01d3220a20686ace80304a26e6f6daad11cf..7f67f8b1bebe4953bb235a540f00d1f8e5581560 100755 (executable)
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
@@ -16,11 +16,14 @@ 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_string 'noserverunicast:bool'
+       proto_config_add_array 'ip6prefix:list(ip6addr)'
        proto_config_add_string iface_dslite
        proto_config_add_string zone_dslite
+       proto_config_add_string encaplimit_dslite
        proto_config_add_string iface_map
        proto_config_add_string zone_map
+       proto_config_add_string encaplimit_map
        proto_config_add_string iface_464xlat
        proto_config_add_string zone_464xlat
        proto_config_add_string zone
@@ -36,12 +39,21 @@ proto_dhcpv6_init_config() {
        proto_config_add_int "ra_holdoff"
 }
 
+proto_dhcpv6_add_prefix() {
+       append "$3" "$1"
+}
+
+proto_dhcpv6_add_sendopts() {
+       [ -n "$1" ] && append "$3" "-x$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 noserverunicast ip6prefix ip6prefixes iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass sendopts delegate zone_dslite zone_map zone_464xlat zone encaplimit_dslite encaplimit_map soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff
+       json_get_vars reqaddress reqprefix clientid reqopts defaultreqopts noslaaconly forceprefix extendprefix norelease noserverunicast iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone encaplimit_dslite encaplimit_map soltimeout fakeroutes sourcefilter keep_ra_dnslifetime ra_holdoff
+       json_for_each_item proto_dhcpv6_add_prefix ip6prefix ip6prefixes
 
        # Configure
        local opts=""
@@ -60,6 +72,8 @@ proto_dhcpv6_setup() {
 
        [ "$norelease" = "1" ] && append opts "-k"
 
+       [ "$noserverunicast" = "1" ] && append opts "-U"
+
        [ -n "$ifaceid" ] && append opts "-i$ifaceid"
 
        [ -n "$vendorclass" ] && append opts "-V$vendorclass"
@@ -75,16 +89,11 @@ proto_dhcpv6_setup() {
                append opts "-r$opt"
        done
 
-       sendopts_cb() {
-               local val="$1"
-               append opts "-x$val"
-       }
-
-       json_for_each_item sendopts_cb sendopts
+       json_for_each_item proto_dhcpv6_add_sendopts sendopts opts
 
        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"
@@ -94,6 +103,8 @@ proto_dhcpv6_setup() {
        [ -n "$zone_map" ] && proto_export "ZONE_MAP=$zone_map"
        [ -n "$zone_464xlat" ] && proto_export "ZONE_464XLAT=$zone_464xlat"
        [ -n "$zone" ] && proto_export "ZONE=$zone"
+       [ -n "$encaplimit_dslite" ] && proto_export "ENCAPLIMIT_DSLITE=$encaplimit_dslite"
+       [ -n "$encaplimit_map" ] && proto_export "ENCAPLIMIT_MAP=$encaplimit_map"
        [ "$fakeroutes" != "0" ] && proto_export "FAKE_ROUTES=1"
        [ "$sourcefilter" = "0" ] && proto_export "NOSOURCEFILTER=1"
        [ "$extendprefix" = "1" ] && proto_export "EXTENDPREFIX=1"