odhcp6c: add route-workaround for broken IPv6-ISPs

[openwrt/staging/chunkeey.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 ab344e1d30446a585eb063782c65265df437b326..5914abe0bb61632b528336b77b0c0899b72301af 100755 (executable)
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
@@ -5,24 +5,36 @@
 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 "forceprefix"
-       proto_config_add_string "norelease"
-       proto_config_add_string "ip6prefix"
-       proto_config_add_string "iface_dslite"
-       proto_config_add_string "ifaceid"
+       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 'noslaaconly:bool'
+       proto_config_add_string 'forceprefix: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 zone
+       proto_config_add_string 'ifaceid:ip6addr'
+       proto_config_add_string 'sourcerouting:bool'
+       proto_config_add_string "userclass"
+       proto_config_add_string "vendorclass"
+       proto_config_add_boolean delegate
+       proto_config_add_int "soltimeout"
+       proto_config_add_boolean fakeroutes
 }
 
 proto_dhcpv6_setup() {
        local config="$1"
        local iface="$2"
 
-       local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite ifaceid
-       json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite ifaceid
+       local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone soltimeout fakeroutes
+       json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map ifaceid sourcerouting userclass vendorclass delegate zone_dslite zone_map zone soltimeout fakeroutes
 
 
        # Configure
@@ -42,12 +54,26 @@ proto_dhcpv6_setup() {
 
        [ -n "$ifaceid" ] && append opts "-i$ifaceid"
 
+       [ -n "$vendorclass" ] && append opts "-V$vendorclass"
+
+       [ -n "$userclass" ] && append opts "-u$userclass"
+
        for opt in $reqopts; do
                append opts "-r$opt"
        done
 
+       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"
+       [ "$sourcerouting" != "0" ] && proto_export "SOURCE_ROUTING=1"
+       [ "$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" ] && proto_export "ZONE=$zone"
+       [ "$fakeroutes" != "0" ] && proto_export "FAKE_ROUTES=1"
 
        proto_export "INTERFACE=$config"
        proto_run_command "$config" odhcp6c \
@@ -55,6 +81,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"