aboutsummaryrefslogtreecommitdiffstats
path: root/package/6in4
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-10-19 02:07:29 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-10-19 02:07:29 +0000
commit64f992524559dae48b46cc102fb0f5955e238305 (patch)
treeb569ff0180773aaa90fa3de4decedae2fa9b1397 /package/6in4
parentb5cfdcd278a1790c3bde26f4add12ad8bf83106d (diff)
downloadupstream-64f992524559dae48b46cc102fb0f5955e238305.tar.gz
upstream-64f992524559dae48b46cc102fb0f5955e238305.tar.bz2
upstream-64f992524559dae48b46cc102fb0f5955e238305.zip
6in4: - add log entries for update operations - always update tunnel, even if wan ip is unchanged - use multiple wget tries before giving up, resolv.conf might not be ready when ifup is triggered
SVN-Revision: 23528
Diffstat (limited to 'package/6in4')
-rw-r--r--package/6in4/Makefile2
-rw-r--r--package/6in4/files/6in4.hotplug21
2 files changed, 18 insertions, 5 deletions
diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index 1f0573b97a..d03d2396ff 100644
--- a/package/6in4/Makefile
+++ b/package/6in4/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=6in4
-PKG_VERSION:=6
+PKG_VERSION:=7
PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk
diff --git a/package/6in4/files/6in4.hotplug b/package/6in4/files/6in4.hotplug
index 534682e99a..9499296d92 100644
--- a/package/6in4/files/6in4.hotplug
+++ b/package/6in4/files/6in4.hotplug
@@ -17,11 +17,9 @@ if [ "$ACTION" = ifup ]; then
config_get wandev "$cfg" wan_device "$(find_6in4_wanif)"
[ "$wandev" = "$DEVICE" ] || return 0
- local oldip
local wanip=$(find_6in4_wanip "$wandev")
- config_get oldip "$cfg" ipaddr
- [ -n "$wanip" ] && [ "$oldip" != "$wanip" ] && {
+ [ -n "$wanip" ] && {
local tunnelid
config_get tunnelid "$cfg" tunnelid
@@ -37,7 +35,22 @@ if [ "$ACTION" = ifup ]; then
}
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
+ )&
}
}
}