[package] base-files: use uci_get() wrapper (#7312)

[openwrt.git] / package / base-files / files / etc / hotplug.d / iface / 10-routes

diff --git a/package/base-files/files/etc/hotplug.d/iface/10-routes b/package/base-files/files/etc/hotplug.d/iface/10-routes
index 4b55f8b..0116682 100644 (file)
--- a/package/base-files/files/etc/hotplug.d/iface/10-routes
+++ b/package/base-files/files/etc/hotplug.d/iface/10-routes
@@ -20,15 +20,48 @@ add_route() {
                return 1
        }
        [ -n "$gateway" ] || {
                return 1
        }
        [ -n "$gateway" ] || {

-               echo "Missing gateway in route section $config"
-               return 1
+               config_get gateway "$interface" gateway

        }
 
        }
 

-       netmask="${netmask:-255.255.255.255}"
+       # handle "0.0.0.0" as "no gateway given" to allow
+       # defining gateway-less routes while still keeping
+       # the possibility to have static routes with a
+       # proper gateway on interfaces with dynamic ips 
+       [ "$gateway" = "0.0.0.0" ] && gateway=""
+

        dest="${netmask:+-net "$target" netmask "$netmask"}"
        dest="${dest:--host "$target"}"
        
        dest="${netmask:+-net "$target" netmask "$netmask"}"
        dest="${dest:--host "$target"}"
        

-       /sbin/route add $dest gw "$gateway" ${dev:+dev "$dev"} ${metric:+ metric "$metric"}
+       /sbin/route add $dest ${gateway:+gw "$gateway"} \
+               ${dev:+dev "$dev"} ${metric:+ metric "$metric"}
+}
+
+add_route6() {
+       local config="$1"
+
+       # is this route intended for the
+       # $INTERFACE of this hotplug event
+       config_get interface "$config" interface
+       [ "$interface" != "$INTERFACE" ] && return 0
+       
+       # get the real interface name from network config
+       config_get dev "$interface" ifname
+
+       config_get target "$config" target
+       config_get gateway "$config" gateway
+       config_get metric "$config" metric
+
+       # make sure there is a gateway and a target
+       [ -n "$target" ] || {
+               echo "Missing target in route section $config"
+               return 1
+       }
+       [ -n "$gateway" ] || {
+               config_get gateway "$interface" gateway
+       }
+
+       /sbin/route -A inet6 add $target ${gateway:+gw "$gateway"} \
+               ${dev:+dev "$dev"} ${metric:+ metric "$metric"}

 }
 
 case "$ACTION" in
 }
 
 case "$ACTION" in


@@ -36,5 +69,6 @@ case "$ACTION" in
                include /lib/network
                scan_interfaces
                config_foreach "add_route" route
                include /lib/network
                scan_interfaces
                config_foreach "add_route" route

+               config_foreach "add_route6" route6

        ;;
 esac
        ;;
 esac