[backfire] merge r27449

[openwrt-10.03/.git] / package / 6in4 / files / 6in4.sh

diff --git a/package/6in4/files/6in4.sh b/package/6in4/files/6in4.sh
index 62a60dc8f66c98efffb35b7f223b32a2fe7e6bf0..5aafaa0ba19e41a53b831389a6a7332114dfec80 100755 (executable)
--- a/package/6in4/files/6in4.sh
+++ b/package/6in4/files/6in4.sh
@@ -2,7 +2,7 @@
 # Copyright (c) 2010 OpenWrt.org
 
 find_6in4_wanif() {
-       local if=$(ip -4 r l e 0/0); if="${if#default* dev }"; if="${if%% *}"
+       local if=$(ip -4 r l e 0.0.0.0/0); if="${if#default* dev }"; if="${if%% *}"
        [ -n "$if" ] && grep -qs "^ *$if:" /proc/net/dev && echo "$if"
 }
 
@@ -42,6 +42,9 @@ setup_interface_6in4() {
        local ttl
        config_get ttl "$cfg" ttl
 
+       local metric
+       config_get metric "$cfg" metric
+
        local defaultroute
        config_get_bool defaultroute "$cfg" defaultroute 1
 
@@ -70,7 +73,11 @@ setup_interface_6in4() {
                uci_set_state network "$cfg" ip6addr $local6
 
                [ "$defaultroute" = 1 ] && {
-                       ip -6 route add ::/0 dev $link
+                       local inet="::/0"
+                       local kern="$(uname -r)"
+                       [ "${kern#2.4}" != "$kern" ] && inet="2000::/3"
+
+                       ip -6 route add $inet ${metric:+metric $metric} dev $link
                        uci_set_state network "$cfg" defaultroute 1
                }
 
@@ -91,7 +98,11 @@ stop_interface_6in4() {
                env -i ACTION="ifdown" INTERFACE="$cfg" DEVICE="$link" PROTO=6in4 /sbin/hotplug-call "iface" &
 
                [ "$defaultroute" = "1" ] && {
-                       ip -6 route del ::/0 dev $link
+                       local inet="::/0"
+                       local kern="$(uname -r)"
+                       [ "${kern#2.4}" != "$kern" ] && inet="2000::/3"
+
+                       ip -6 route del $inet dev $link
                }
 
                ip addr del $local6 dev $link