diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-06-18 21:40:34 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-06-18 21:40:34 +0000 |
| commit | 0a73ff2600eba3c72d1e7532d3a25460d7d5e264 (patch) | |
| tree | 3b2d8f3e829a4b29dff42a86d798a7f40ae7a992 /package/6in4/files/6in4.sh | |
| parent | ff81d5ec3a2466df68811f8a80baf467859a2191 (diff) | |
| download | upstream-0a73ff2600eba3c72d1e7532d3a25460d7d5e264.tar.gz upstream-0a73ff2600eba3c72d1e7532d3a25460d7d5e264.tar.bz2 upstream-0a73ff2600eba3c72d1e7532d3a25460d7d5e264.zip | |
[package] 6in4, 6to4: further simplify protocol backends
- use new default route dependencies to trigger bringup
- remove old hotplug scripts
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32428 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/6in4/files/6in4.sh')
| -rwxr-xr-x | package/6in4/files/6in4.sh | 14 |
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 } |