summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-08-19 00:59:05 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-08-19 00:59:05 +0000
commit28ddaa0be90eb40be1de43e973260b7be20872c3 (patch)
tree7b07f78bd3b09cb985337c84c5be237da88a93e2
parent0c4c78bf4c8df288a664bf6dca154d77ea03f14e (diff)
[package] 6in4: bypass uci state when reading local IPv4 addr, specify TTL during tunnel creation (#7769)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22708 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/6in4/Makefile2
-rwxr-xr-xpackage/6in4/files/6in4.sh6
2 files changed, 3 insertions, 5 deletions
diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index 289d28ee3..c56b9c57c 100644
--- a/package/6in4/Makefile
+++ b/package/6in4/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=6in4
-PKG_VERSION:=4
+PKG_VERSION:=5
PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk
diff --git a/package/6in4/files/6in4.sh b/package/6in4/files/6in4.sh
index a119138d0..bea2e82ea 100755
--- a/package/6in4/files/6in4.sh
+++ b/package/6in4/files/6in4.sh
@@ -28,8 +28,7 @@ setup_interface_6in4() {
local cfg="$2"
local link="6in4-$cfg"
- local local4
- config_get local4 "$cfg" ipaddr
+ local local4=$(uci_get network "$cfg" local4)
local remote4
config_get remote4 "$cfg" peeraddr
@@ -62,10 +61,9 @@ setup_interface_6in4() {
uci_set_state network "$cfg" ifname $link
uci_set_state network "$cfg" auto 0
- ip tunnel add $link mode sit remote $remote4 local $local4 ttl 255
+ ip tunnel add $link mode sit remote $remote4 local $local4 ttl ${ttl:-64}
ip link set $link up
ip link set mtu ${mtu:-1280} dev $link
- ip tunnel change $link ttl ${ttl:-64}
ip addr add $local6 dev $link
uci_set_state network "$cfg" ipaddr $local4