6in4, 6to4: further simplify protocol backends - use new default route dependencies...

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

diff --git a/package/6in4/files/6in4.sh b/package/6in4/files/6in4.sh
index 747662c08accb1afee28f1c9f8de5fbaa879602a..71bc68940c6bf0956acced3779dcaaab237294e5 100755 (executable)
--- a/package/6in4/files/6in4.sh
+++ b/package/6in4/files/6in4.sh
@@ -9,13 +9,6 @@
        init_proto "$@"
 }
 
-tun_error() {
-       local cfg="$1"; shift;
-
-       [ -n "$1" ] && proto_notify_error "$cfg" "$@"
-       proto_block_restart "$cfg"
-}
-
 proto_6in4_setup() {
        local cfg="$1"
        local iface="$2"
@@ -25,14 +18,17 @@ proto_6in4_setup() {
        json_get_vars mtu ttl ipaddr peeraddr ip6addr tunnelid username password
 
        [ -z "$ip6addr" -o -z "$peeraddr" ] && {
-               tun_error "$cfg" "MISSING_ADDRESS"
+               proto_notify_error "$cfg" "MISSING_ADDRESS"
+               proto_block_restart "$cfg"
                return
        }
 
+       ( proto_add_host_dependency "$cfg" 0.0.0.0 )
+
        [ -z "$ipaddr" ] && {
                local wanif
                if ! network_find_wan wanif || ! network_get_ipaddr ipaddr "$wanif"; then
-                       tun_error "$cfg" "NO_WAN_LINK"
+                       proto_notify_error "$cfg" "NO_WAN_LINK"
                        return
                fi
        }