odhcp6c: Add support for userclass and vendorclass

[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 6cf7521..387fa30 100755 (executable)
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
@@ -10,16 +10,22 @@ proto_dhcpv6_init_config() {
        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"
+       proto_config_add_string "sourcerouting"
+       proto_config_add_string "userclass"
+       proto_config_add_string "vendorclass"
 }
 
 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 noslaaconly forceprefix norelease ip6prefix iface_dslite ifaceid sourcerouting userclass vendorclass
+       json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite ifaceid sourcerouting userclass vendorclass
 
 
        # Configure
@@ -33,13 +39,23 @@ proto_dhcpv6_setup() {
 
        [ "$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"
+
        for opt in $reqopts; do
                append opts "-r$opt"
        done
 
        [ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix"
+       [ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite"
+       [ "$sourcerouting" != "0" ] && proto_export "SOURCE_ROUTING=1"
 
        proto_export "INTERFACE=$config"
        proto_run_command "$config" odhcp6c \