diff options
| author | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-19 02:07:29 +0000 |
|---|---|---|
| committer | jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-19 02:07:29 +0000 |
| commit | 75afa914774d7b53cd5948d0c7a9b33cd708b32b (patch) | |
| tree | da490c57b8b312ca533a11d793026d94e67266ce | |
| parent | 6ccbdca3d7eb07b53a7dbd0838dbc09d40ee5f2c (diff) | |
[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
| -rw-r--r-- | package/6in4/Makefile | 2 | ||||
| -rw-r--r-- | package/6in4/files/6in4.hotplug | 21 |
2 files changed, 18 insertions, 5 deletions
diff --git a/package/6in4/Makefile b/package/6in4/Makefile index 1f0573b97..d03d2396f 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 534682e99..9499296d9 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 + )& } } } |