[package] base-files: the busybox update to v1.15.3 completely broke udhcpc route...

[openwrt.git] / package / base-files / files / usr / share / udhcpc / default.script

diff --git a/package/base-files/files/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
index 7dfb0f9..b614c45 100755 (executable)
--- a/package/base-files/files/usr/share/udhcpc/default.script
+++ b/package/base-files/files/usr/share/udhcpc/default.script
@@ -6,12 +6,21 @@ include /lib/network
 RESOLV_CONF="/tmp/resolv.conf.auto"
 
 change_state () {
+       [ -n "$ifc" ] || return
        uci_revert_state "$1" "$2" "$3" "$4"
        uci_set_state "$1" "$2" "$3" "$4"
 }
 
-uci_get() {
-       uci -P /dev/null get "$1" 2>/dev/null
+set_classless_routes() {
+       local max=128
+       local type
+       while [ -n "$1" -a -n "$2" -a $max -gt 0 ]; do
+               [ ${1##*/} -eq 32 ] && type=host || type=net
+               echo "udhcpc: adding route for $type $1 via $2"
+               route add -$type "$1" gw "$2" dev "$interface"
+               max=$(($max-1))
+               shift 2
+       done
 }
 
 setup_interface () {
@@ -22,10 +31,13 @@ setup_interface () {
        local old_dns
        local user_dns
        local user_router
+       local user_metric
 
-       config_get old_ip        "$ifc" ipaddr
-       config_get old_broadcast "$ifc" broadcast
-       config_get old_subnet    "$ifc" netmask
+       [ -n "$ifc" ] && {
+               old_ip="$(uci_get_state network "$ifc" ipaddr)"
+               old_broadcast="$(uci_get_state network "$ifc" broadcast)"
+               old_subnet="$(uci_get_state network "$ifc" netmask)"
+       }
 
        [ "$ip" != "$old_ip" ] \
        || [ "${broadcast:-+}" != "$old_broadcast" ] \
@@ -40,17 +52,20 @@ setup_interface () {
 
 
        # Default Route
-       change_state network "$ifc" lease_gateway "$router"
-       config_get old_router "$ifc" gateway
-       user_router=$(uci_get "network.$ifc.gateway")
-       [ -n "$user_router" ] && router="$user_router"
+       [ -n "$ifc" ] && {
+               change_state network "$ifc" lease_gateway "$router"
+               old_router="$(uci_get_state network "$ifc" gateway)"
+               user_router="$(uci_get network "$ifc" gateway)"
+               user_metric="$(uci_get network "$ifc" metric)"
+               [ -n "$user_router" ] && router="$user_router"
+       }
 
-       [ -n "$router" ] && [ "$router" != "0.0.0.0" ] && [ "$router" != "$old_router" ] && {
+       [ -n "$router" ] && [ "$router" != "0.0.0.0" ] && [ "$router" != "255.255.255.255" ] && [ "$router" != "$old_router" ] && {
                echo "udhcpc: setting default routers: $router"
 
                local valid_gw=""
                for i in $router ; do
-                       route add default gw $i dev $interface
+                       route add default gw $i ${user_metric:+metric $user_metric} dev $interface
                        valid_gw="${valid_gw:+$valid_gw|}$i"
                done
                
@@ -62,25 +77,29 @@ setup_interface () {
                change_state network "$ifc" gateway "$router"
        }
 
+       # CIDR STATIC ROUTES (rfc3442)
+       [ -n "$staticroutes" ] && set_classless_routes $staticroutes
+       [ -n "$msstaticroutes" ] && set_classless_routes $msstaticroutes
 
        # DNS
-       config_get old_dns "$ifc" dns
+       old_dns=$(uci_get_state network "$ifc" dns)
+       old_domain=$(uci_get_state network "$ifc" dnsdomain)
        user_dns=$(uci_get "network.$ifc.dns")
        [ -n "$user_dns" ] && dns="$user_dns"
 
-       [ -n "$dns" ] && [ "$dns" != "$old_dns" ] && {
+       [ -n "$dns" ] && [ "$dns" != "$old_dns" -o -n "$user_dns" ] && {
                echo "udhcpc: setting dns servers: $dns"
-               echo -n > "${RESOLV_CONF}.tmp"
-               for i in $dns ; do
-                       echo "nameserver $i" >> "${RESOLV_CONF}.tmp"
-               done
-               ${domain:+echo search $domain} >> "${RESOLV_CONF}.tmp"
-               mv "${RESOLV_CONF}.tmp" "$RESOLV_CONF"
-
-               change_state network "$ifc" dnsdomain "$domain"
-               change_state network "$ifc" dns "$dns"
+               add_dns "$ifc" $dns
+
+               [ -n "$domain" ] && [ "$domain" != "$old_domain" ] && {
+                       echo "udhcpc: setting dns domain: $domain"
+                       sed -i -e "${old_domain:+/^search $old_domain$/d; }/^search $domain$/d" "${RESOLV_CONF}"
+                       echo "search $domain" >> "${RESOLV_CONF}"
+                       change_state network "$ifc" dnsdomain "$domain"
+               }
        }
 
+       [ -n "$ifc" ] || return
 
        # UCI State
        change_state network "$ifc" lease_server "$serverid"
@@ -98,19 +117,34 @@ setup_interface () {
 
 
 scan_interfaces
-
-for ifc in $interfaces; do
-       config_get ifname "$ifc" ifname
-       [ "$ifname" = "$interface" ] || continue
-
-       config_get proto "$ifc" proto
-       [ "$proto" = "dhcp" ] || continue
+applied=
+for ifc in $interfaces __default; do
+       if [ "$ifc" = __default ]; then
+               ifc=""
+               [ -n "$applied" ] && continue
+       else
+               config_get ifname "$ifc" ifname
+               [ "$ifname" = "$interface" ] || continue
+
+               config_get proto "$ifc" proto
+               [ "$proto" = "dhcp" ] || continue
+               applied=true
+       fi
 
        case "$1" in
                deconfig)
                        ifconfig "$interface" 0.0.0.0
-                       env -i ACTION="ifdown" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
-                       uci_revert_state network "$ifc"
+                       [ -n "$ifc" ] && {
+                               env -i ACTION="ifdown" INTERFACE="$ifc" DEVICE="$ifname" PROTO=dhcp /sbin/hotplug-call iface
+                       
+                               config_get device "$ifc" device
+                               config_get ifname "$ifc" ifname
+                               config_get aliases "$ifc" aliases
+                               uci_revert_state network "$ifc"
+                               [ -n "$device" ] && uci_set_state network "$ifc" device "$device"
+                               [ -n "$ifname" ] && uci_set_state network "$ifc" ifname "$ifname"
+                               [ -n "$aliases" ] && uci_set_state network "$ifc" aliases "$aliases"
+                       }
                ;;
                renew)
                        setup_interface update
@@ -119,9 +153,9 @@ for ifc in $interfaces; do
                        setup_interface ifup
                ;;
        esac
-
-       # user rules
-       [ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
 done
 
+# user rules
+[ -f /etc/udhcpc.user ] && . /etc/udhcpc.user
+
 exit 0