aboutsummaryrefslogtreecommitdiffstats
path: root/package/6in4/files
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
commit16de170f1aa45b651f9efb3534f612ca5b6c7012 (patch)
treeda490c57b8b312ca533a11d793026d94e67266ce /package/6in4/files
parented2fe1cf2d2f804005cbac71c21ae0b8cb3467a5 (diff)
downloadupstream-16de170f1aa45b651f9efb3534f612ca5b6c7012.tar.gz
upstream-16de170f1aa45b651f9efb3534f612ca5b6c7012.tar.bz2
upstream-16de170f1aa45b651f9efb3534f612ca5b6c7012.zip
[package] 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23528 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/6in4/files')
-rw-r--r--package/6in4/files/6in4.hotplug21
1 files changed, 17 insertions, 4 deletions
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
+ )&
}
}
}