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

6in4: bypass uci state when reading local IPv4 addr, specify TTL during tunnel creation (#7769)

Browse source 
SVN-Revision: 22708
This commit is contained in:
Jo-Philipp Wich 2010-08-19 00:59:05 +00:00
parent 0826570bc4
commit 73c9032e87
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/6in4/Makefile
View file

@ -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

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

@ -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