From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 17 Jun 2012 12:27:16 +0000 (+0000)
Subject: 6in4: change local4 option name back to ipaddr
X-Git-Tag: reboot~13586
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=89732577aadc040b4f42909e158ea0057690f347;p=openwrt%2Fstaging%2Fnoltari.git

6in4: change local4 option name back to ipaddr

SVN-Revision: 32401
---

diff --git a/package/6in4/files/6in4.sh b/package/6in4/files/6in4.sh
index 4341465feb..747662c08a 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