6to4: fix interface error handling

SVN-Revision: 31034
This commit is contained in:
Felix Fietkau 2012-03-19 21:09:57 +00:00
parent 6df99730c4
commit f33c1deb65

View file

@ -126,14 +126,14 @@ proto_6to4_setup() {
local wanif=$(find_6to4_wanif) local wanif=$(find_6to4_wanif)
[ -z "$wanif" ] && { [ -z "$wanif" ] && {
tun_error "NO_WAN_LINK" tun_error "$cfg" "NO_WAN_LINK"
return return
} }
. /lib/network/config.sh . /lib/network/config.sh
local wancfg="$(find_config "$wanif")" local wancfg="$(find_config "$wanif")"
[ -z "$wancfg" ] && { [ -z "$wancfg" ] && {
tun_error "NO_WAN_LINK" tun_error "$cfg" "NO_WAN_LINK"
return return
} }
@ -144,12 +144,12 @@ proto_6to4_setup() {
} }
[ -z "$local4" ] && { [ -z "$local4" ] && {
tun_error "NO_WAN_LINK" tun_error "$cfg" "NO_WAN_LINK"
return return
} }
test_6to4_rfc1918 "$local4" && { test_6to4_rfc1918 "$local4" && {
tun_error "INVALID_LOCAL_ADDRESS" tun_error "$cfg" "INVALID_LOCAL_ADDRESS"
return return
} }