aboutsummaryrefslogtreecommitdiffstats
path: root/package/6in4/files/6in4.sh
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-06-18 21:40:34 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-06-18 21:40:34 +0000
commit4dc3b124e9d8941fea3655879f2da9e0acf90bc6 (patch)
treeacbfee34b76fb592af6a068faed4cac405df8df7 /package/6in4/files/6in4.sh
parent992d685ea44a9bd448b8d667aca68dd67484a817 (diff)
downloadupstream-4dc3b124e9d8941fea3655879f2da9e0acf90bc6.tar.gz
upstream-4dc3b124e9d8941fea3655879f2da9e0acf90bc6.tar.bz2
upstream-4dc3b124e9d8941fea3655879f2da9e0acf90bc6.zip
6in4, 6to4: further simplify protocol backends - use new default route dependencies to trigger bringup - remove old hotplug scripts
SVN-Revision: 32428
Diffstat (limited to 'package/6in4/files/6in4.sh')
-rwxr-xr-xpackage/6in4/files/6in4.sh14
1 files changed, 5 insertions, 9 deletions
diff --git a/package/6in4/files/6in4.sh b/package/6in4/files/6in4.sh
index 747662c08a..71bc68940c 100755
--- 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
}