KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

6in4: change local4 option name back to ipaddr

Browse source 
SVN-Revision: 32401
This commit is contained in:
Jo-Philipp Wich 2012-06-17 12:27:16 +00:00
parent 76000dc6ed
commit 89732577aa
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
package/6in4/files/6in4.sh
View file

@ -21,17 +21,17 @@ proto_6in4_setup() {
local iface="$2" local iface="$2"
local link="6in4-$cfg" local link="6in4-$cfg"
local mtu ttl local4 peeraddr ip6addr tunnelid username password local mtu ttl ipaddr peeraddr ip6addr tunnelid username password
json_get_vars mtu ttl local4 peeraddr ip6addr tunnelid username password json_get_vars mtu ttl ipaddr peeraddr ip6addr tunnelid username password
[ -z "$ip6addr" -o -z "$peeraddr" ] && { [ -z "$ip6addr" -o -z "$peeraddr" ] && {
tun_error "$cfg" "MISSING_ADDRESS" tun_error "$cfg" "MISSING_ADDRESS"
return return
} }
[ -z "$local4" ] && { [ -z "$ipaddr" ] && {
local wanif local wanif
if ! network_find_wan wanif || ! network_get_ipaddr local4 "$wanif"; then if ! network_find_wan wanif || ! network_get_ipaddr ipaddr "$wanif"; then
tun_error "$cfg" "NO_WAN_LINK" tun_error "$cfg" "NO_WAN_LINK"
return return
fi fi
@ -49,7 +49,7 @@ proto_6in4_setup() {
json_add_string mode sit json_add_string mode sit
json_add_int mtu "${mtu:-1280}" json_add_int mtu "${mtu:-1280}"
json_add_int ttl "${ttl:-64}" json_add_int ttl "${ttl:-64}"
json_add_string local "$local4" json_add_string local "$ipaddr"
json_add_string remote "$peeraddr" json_add_string remote "$peeraddr"
proto_close_tunnel proto_close_tunnel