softwires: redesign dhcp(v6) provisioning

[openwrt.git] / package / network / config / netifd / files / lib / netifd / dhcp.script

diff --git a/package/network/config/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script
index 948c3cd..db3fc01 100755 (executable)
--- a/package/network/config/netifd/files/lib/netifd/dhcp.script
+++ b/package/network/config/netifd/files/lib/netifd/dhcp.script
@@ -33,9 +33,15 @@ setup_interface () {
        for domain in $domain; do
                proto_add_dns_search "$domain"
        done
+
+       proto_add_data
+       [ -n "$ZONE" ] && json_add_string zone "$ZONE"
+       proto_close_data
+
        proto_send_update "$INTERFACE"
 
-       if [ -n "$IFACE6RD" -a -n "$ip6rd" ]; then
+
+       if [ "$IFACE6RD" != 0 -a -n "$ip6rd" ]; then
                local v4mask="${ip6rd%% *}"
                ip6rd="${ip6rd#* }"
                local ip6rdprefixlen="${ip6rd%% *}"
@@ -44,6 +50,9 @@ setup_interface () {
                ip6rd="${ip6rd#* }"
                local ip6rdbr="${ip6rd%% *}"
 
+               [ -n "$ZONE" ] || ZONE=$(fw3 network $INTERFACE)
+               [ -z "$IFACE6RD" -o "$IFACE6RD" = 1 ] && IFACE6RD=${INTERFACE}_6rd
+
                json_init
                json_add_string name "$IFACE6RD"
                json_add_string ifname "@$INTERFACE"
@@ -54,6 +63,7 @@ setup_interface () {
                json_add_int ip6prefixlen "$ip6rdprefixlen"
                json_add_string tunlink "$INTERFACE"
                [ -n "$IFACE6RD_DELEGATE" ] && json_add_boolean delegate "$IFACE6RD_DELEGATE"
+               [ -n "$ZONE6RD" ] || ZONE6RD=$ZONE
                [ -n "$ZONE6RD" ] && json_add_string zone "$ZONE6RD"
                json_close_object