X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/bcab7d9363f55d8ec433f6cb51fc24cfcbca813d..e973943aa376bda8430c3a17f0c8e0f8a8999bd2:/package/6in4/files/6in4.hotplug?ds=sidebyside diff --git a/package/6in4/files/6in4.hotplug b/package/6in4/files/6in4.hotplug index 790edc0e1..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 @@ -32,12 +30,27 @@ if [ "$ACTION" = ifup ]; then config_get password "$cfg" password [ -n "$tunnelid" ] && [ -n "$username" ] && [ -n "$password" ] && { - [ "${#password}" == 32 -a -z "${password//[a-f0-9]/}" ] && { + [ "${#password}" == 32 -a -z "${password//[a-f0-9]/}" ] || { password="$(echo -n "$password" | md5sum)"; password="${password%% *}" } 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 + )& } } }