odhcp6c: fix appending of emtpy sendopt value (FS#1336)

[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 6cf7521fe0f07c556c43ce79bdfd16deaca2ee13..5c2ee6b988ca085337201a97ad8a80a1c9bb38e8 100755 (executable)
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
@@ -5,22 +5,43 @@
 init_proto "$@"
 
 proto_dhcpv6_init_config() {
-       proto_config_add_string "reqaddress"
-       proto_config_add_string "reqprefix"
-       proto_config_add_string "clientid"
-       proto_config_add_string "reqopts"
-       proto_config_add_string "noslaaconly"
-       proto_config_add_string "norelease"
-       proto_config_add_string "ip6prefix"
+       renew_handler=1
+
+       proto_config_add_string 'reqaddress:or("try","force","none")'
+       proto_config_add_string 'reqprefix:or("auto","no",range(0, 64))'
+       proto_config_add_string clientid
+       proto_config_add_string 'reqopts:list(uinteger)'
+       proto_config_add_string 'defaultreqopts:bool'
+       proto_config_add_string 'noslaaconly:bool'
+       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 iface_dslite
+       proto_config_add_string zone_dslite
+       proto_config_add_string iface_map
+       proto_config_add_string zone_map
+       proto_config_add_string iface_464xlat
+       proto_config_add_string zone_464xlat
+       proto_config_add_string zone
+       proto_config_add_string 'ifaceid:ip6addr'
+       proto_config_add_string "userclass"
+       proto_config_add_string "vendorclass"
+       proto_config_add_array "sendopts:list(string)"
+       proto_config_add_boolean delegate
+       proto_config_add_int "soltimeout"
+       proto_config_add_boolean fakeroutes
+       proto_config_add_boolean sourcefilter
+       proto_config_add_boolean keep_ra_dnslifetime
+       proto_config_add_int "ra_holdoff"
 }
 
 proto_dhcpv6_setup() {
        local config="$1"
        local iface="$2"
 
-       local reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix
-       json_get_vars reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix
-
+       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
 
        # Configure
        local opts=""
@@ -31,15 +52,51 @@ proto_dhcpv6_setup() {
 
        [ -n "$clientid" ] && append opts "-c$clientid"
 
+       [ "$defaultreqopts" = "0" ] && append opts "-R"
+
        [ "$noslaaconly" = "1" ] && append opts "-S"
 
+       [ "$forceprefix" = "1" ] && append opts "-F"
+
        [ "$norelease" = "1" ] && append opts "-k"
 
+       [ -n "$ifaceid" ] && append opts "-i$ifaceid"
+
+       [ -n "$vendorclass" ] && append opts "-V$vendorclass"
+
+       [ -n "$userclass" ] && append opts "-u$userclass"
+
+       [ "$keep_ra_dnslifetime" = "1" ] && append opts "-L"
+
+       [ -n "$ra_holdoff" ] && append opts "-m$ra_holdoff"
+
+       local opt
        for opt in $reqopts; do
                append opts "-r$opt"
        done
 
+       sendopts_cb() {
+               local val="$1"
+               [ -n "$val" ] && append opts "-x$val"
+       }
+
+       json_for_each_item sendopts_cb sendopts
+
+       append opts "-t${soltimeout:-120}"
+
        [ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix"
+       [ -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"
+       [ "$delegate" = "0" ] && proto_export "IFACE_DSLITE_DELEGATE=0"
+       [ "$delegate" = "0" ] && proto_export "IFACE_MAP_DELEGATE=0"
+       [ -n "$zone_dslite" ] && proto_export "ZONE_DSLITE=$zone_dslite"
+       [ -n "$zone_map" ] && proto_export "ZONE_MAP=$zone_map"
+       [ -n "$zone_464xlat" ] && proto_export "ZONE_464XLAT=$zone_464xlat"
+       [ -n "$zone" ] && proto_export "ZONE=$zone"
+       [ "$fakeroutes" != "0" ] && proto_export "FAKE_ROUTES=1"
+       [ "$sourcefilter" = "0" ] && proto_export "NOSOURCEFILTER=1"
+       [ "$extendprefix" = "1" ] && proto_export "EXTENDPREFIX=1"
 
        proto_export "INTERFACE=$config"
        proto_run_command "$config" odhcp6c \
@@ -47,6 +104,13 @@ proto_dhcpv6_setup() {
                $opts $iface
 }
 
+proto_dhcpv6_renew() {
+       local interface="$1"
+       # SIGUSR1 forces odhcp6c to renew its lease
+       local sigusr1="$(kill -l SIGUSR1)"
+       [ -n "$sigusr1" ] && proto_kill_command "$interface" $sigusr1
+}
+
 proto_dhcpv6_teardown() {
        local interface="$1"
        proto_kill_command "$interface"