mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-02-28 15:37:55 +02:00
[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
This commit is contained in:
parent
0c4c78bf4c
commit
28ddaa0be9
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user