netifd: fix fw3 warnings in dhcp script

[openwrt/staging/lynxis/omap.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 77b77f5fece959bafe221bfaedf2ac1defc08a71..e841f9185509995835d9a6294648813add11630f 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,12 @@ setup_interface () {
        # TODO: apply $broadcast
 
        for i in $router; do
-               proto_add_ipv4_route 0.0.0.0 0 "$i"
+               proto_add_ipv4_route "$i" 32 "" "$ip"
+               proto_add_ipv4_route 0.0.0.0 0 "$i" "$ip"
+
+               for r in $CUSTOMROUTES; do
+                       proto_add_ipv4_route "${r%%/*}" "${r##*/}" "$i" "$ip"
+               done
        done
 
        # CIDR STATIC ROUTES (rfc3442)
@@ -33,9 +37,21 @@ setup_interface () {
        for domain in $domain; do
                proto_add_dns_search "$domain"
        done
+
+       proto_add_data
+       [ -n "$ZONE" ]     && json_add_string zone "$ZONE"
+       [ -n "$ntpsrv" ]   && json_add_string ntpserver "$ntpsrv"
+       [ -n "$timesvr" ]  && json_add_string timeserver "$timesvr"
+       [ -n "$hostname" ] && json_add_string hostname "$hostname"
+       [ -n "$message" ]  && json_add_string message "$message"
+       [ -n "$timezone" ] && json_add_int timezone "$timezone"
+       [ -n "$lease" ]    && json_add_int leasetime "$lease"
+       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 +60,9 @@ setup_interface () {
                ip6rd="${ip6rd#* }"
                local ip6rdbr="${ip6rd%% *}"
 
+               [ -n "$ZONE" ] || ZONE=$(fw3 -q network $INTERFACE 2>/dev/null)
+               [ -z "$IFACE6RD" -o "$IFACE6RD" = 1 ] && IFACE6RD=${INTERFACE}_6
+
                json_init
                json_add_string name "$IFACE6RD"
                json_add_string ifname "@$INTERFACE"
@@ -53,16 +72,14 @@ setup_interface () {
                json_add_string ip6prefix "$ip6rdprefix"
                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)"
        fi
-
-       # TODO
-       # [ -n "$ntpsrv" ] &&   change_state network "$ifc" lease_ntpsrv "$ntpsrv"
-       # [ -n "$timesvr" ] &&  change_state network "$ifc" lease_timesrv "$timesvr"
-       # [ -n "$hostname" ] && change_state network "$ifc" lease_hostname "$hostname"
-       # [ -n "$timezone" ] &&         change_state network "$ifc" lease_timezone "$timezone"
 }
 
 deconfig_interface() {
@@ -80,6 +97,6 @@ case "$1" in
 esac
 
 # user rules
-[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
+[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user "$@"
 
 exit 0