diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-06-18 23:08:20 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-06-18 23:08:20 +0000 |
| commit | d65c8552032ba94daae2fa137c3dab0d40e7021b (patch) | |
| tree | 344765f46e2b8e63be04daee9e39c656437da2cd /package/6rd/files/6rd.sh | |
| parent | fdfffd0fbe8e6353b70ce84441aec99e6f50765e (diff) | |
| download | upstream-d65c8552032ba94daae2fa137c3dab0d40e7021b.tar.gz upstream-d65c8552032ba94daae2fa137c3dab0d40e7021b.tar.bz2 upstream-d65c8552032ba94daae2fa137c3dab0d40e7021b.zip | |
6rd: apply the same simplifications done in 6to4 and 6in4
SVN-Revision: 32432
Diffstat (limited to 'package/6rd/files/6rd.sh')
| -rw-r--r-- | package/6rd/files/6rd.sh | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/package/6rd/files/6rd.sh b/package/6rd/files/6rd.sh index 3786ef06f9..d4dea369de 100644 --- a/package/6rd/files/6rd.sh +++ b/package/6rd/files/6rd.sh @@ -9,13 +9,6 @@ init_proto "$@" } -tun_error() { - local cfg="$1"; shift; - - [ -n "$1" ] && proto_notify_error "$cfg" "$@" - proto_block_restart "$cfg" -} - proto_6rd_setup() { local cfg="$1" local iface="$2" @@ -25,14 +18,17 @@ proto_6rd_setup() { json_get_vars mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen [ -z "$ip6prefix" -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 } |