netifd: Set source IP for DHCP static routes as well

[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..54d3aa1 100755 (executable)
--- a/package/network/config/netifd/files/lib/netifd/dhcp.script
+++ b/package/network/config/netifd/files/lib/netifd/dhcp.script
@@ -6,9 +6,8 @@
 
 set_classless_routes() {
        local max=128
-       local type
        while [ -n "$1" -a -n "$2" -a $max -gt 0 ]; do
-               proto_add_ipv4_route "${1%%/*}" "${1##*/}" "$2"
+               proto_add_ipv4_route "${1%%/*}" "${1##*/}" "$2" "$ip"
                max=$(($max-1))
                shift 2
        done
@@ -20,7 +19,7 @@ setup_interface () {
        # TODO: apply $broadcast
 
        for i in $router; do
-               proto_add_ipv4_route 0.0.0.0 0 "$i"
+               proto_add_ipv4_route 0.0.0.0 0 "$i" "$ip"
        done
 
        # CIDR STATIC ROUTES (rfc3442)
@@ -33,9 +32,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 +49,9 @@ setup_interface () {
                ip6rd="${ip6rd#* }"
                local ip6rdbr="${ip6rd%% *}"
 
+               [ -n "$ZONE" ] || ZONE=$(fw3 -q network $INTERFACE)
+               [ -z "$IFACE6RD" -o "$IFACE6RD" = 1 ] && IFACE6RD=${INTERFACE}_6rd
+
                json_init
                json_add_string name "$IFACE6RD"
                json_add_string ifname "@$INTERFACE"
@@ -54,7 +62,9 @@ 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"
+               [ -n "$MTU6RD" ] && json_add_string mtu "$MTU6RD"
                json_close_object
 
                ubus call network add_dynamic "$(json_dump)"