summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-17 12:27:16 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-17 12:27:16 +0000
commitf065f868a466af772775a5e745ac00aa7084e3c5 (patch)
tree5038162ad4def57d0f7e70ee561a212a8f011ee4
parenta17b7b615d1034d66ac86a9080c121868f95b3d4 (diff)
[package] 6in4: change local4 option name back to ipaddr
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32401 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/6in4/files/6in4.sh10
1 files changed, 5 insertions, 5 deletions
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