qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 01:01:52 +02:00
Code

[backfire] merge r23528

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23529 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-10-19 02:08:07 +00:00
parent d072041530
commit db93bad8e2
2 changed files with 18 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 include $(TOPDIR)/rules.mk
PKG_NAME:=6in4 PKG_NAME:=6in4
PKG_VERSION:=6 PKG_VERSION:=7
PKG_RELEASE:=1 PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

21
package/6in4/files/6in4.hotplug
View File

@ -17,11 +17,9 @@ if [ "$ACTION" = ifup ]; then
config_get wandev "$cfg" wan_device "$(find_6in4_wanif)" config_get wandev "$cfg" wan_device "$(find_6in4_wanif)"
[ "$wandev" = "$DEVICE" ] || return 0 [ "$wandev" = "$DEVICE" ] || return 0
local oldip
local wanip=$(find_6in4_wanip "$wandev") local wanip=$(find_6in4_wanip "$wandev")
config_get oldip "$cfg" ipaddr
[ -n "$wanip" ] && [ "$oldip" != "$wanip" ] && { [ -n "$wanip" ] && {
local tunnelid local tunnelid
config_get tunnelid "$cfg" tunnelid config_get tunnelid "$cfg" tunnelid
@ -37,7 +35,22 @@ if [ "$ACTION" = ifup ]; then
} }
uci_set_state network "$cfg" ipaddr "$wanip" uci_set_state network "$cfg" ipaddr "$wanip"
( wget -qO/dev/null "http://ipv4.tunnelbroker.net/ipv4_end.php?ipv4b=AUTO&user_id=$username&pass=$password&tunnel_id=$tunnelid" && ifup "$cfg" )& (
local url="http://ipv4.tunnelbroker.net/ipv4_end.php?ipv4b=AUTO&user_id=$username&pass=$password&tunnel_id=$tunnelid"
local try=0
local max=3
while [ $((++try)) -le $max ]; do
wget -qO/dev/null "$url" 2>/dev/null && {
logger -t 6in4-update "Updated tunnel #$tunnelid endpoint to $wanip"
ifup "$cfg"
break
} || {
logger -t 6in4-update "Try $try/$max failed, retrying"
sleep 1
}
done
)&
} }
} }
} }