From f065f868a466af772775a5e745ac00aa7084e3c5 Mon Sep 17 00:00:00 2001 From: jow Date: Sun, 17 Jun 2012 12:27:16 +0000 Subject: [package] 6in4: change local4 option name back to ipaddr git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32401 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/6in4/files/6in4.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'package/6in4/files/6in4.sh') diff --git a/package/6in4/files/6in4.sh b/package/6in4/files/6in4.sh index 4341465fe..747662c08 100755 --- a/package/6in4/files/6in4.sh +++ b/package/6in4/files/6in4.sh @@ -21,17 +21,17 @@ proto_6in4_setup() { local iface="$2" local link="6in4-$cfg" - local mtu ttl local4 peeraddr ip6addr tunnelid username password - json_get_vars mtu ttl local4 peeraddr ip6addr tunnelid username password + local mtu ttl ipaddr peeraddr ip6addr tunnelid username password + json_get_vars mtu ttl ipaddr peeraddr ip6addr tunnelid username password [ -z "$ip6addr" -o -z "$peeraddr" ] && { tun_error "$cfg" "MISSING_ADDRESS" return } - [ -z "$local4" ] && { + [ -z "$ipaddr" ] && { 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" return fi @@ -49,7 +49,7 @@ proto_6in4_setup() { json_add_string mode sit json_add_int mtu "${mtu:-1280}" json_add_int ttl "${ttl:-64}" - json_add_string local "$local4" + json_add_string local "$ipaddr" json_add_string remote "$peeraddr" proto_close_tunnel -- cgit v1.2.3