diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2011-02-20 18:27:19 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2011-02-20 18:27:19 +0000 |
| commit | 7f75ed29399b99d7e28936c7551fb7be277676d6 (patch) | |
| tree | fb09ec99caf77cdcce4e6c024aafd755df97eef4 | |
| parent | 84c1a05826a6d8dda76e20affd5f5cd1efcafc38 (diff) | |
| download | upstream-7f75ed29399b99d7e28936c7551fb7be277676d6.tar.gz upstream-7f75ed29399b99d7e28936c7551fb7be277676d6.tar.bz2 upstream-7f75ed29399b99d7e28936c7551fb7be277676d6.zip | |
6in4: re-establish tunnel also if no credentials are used (static setup)
SVN-Revision: 25627
| -rw-r--r-- | package/6in4/Makefile | 2 | ||||
| -rw-r--r-- | package/6in4/files/6in4.hotplug | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/package/6in4/Makefile b/package/6in4/Makefile index 905d7f810b..9a2cfe20d2 100644 --- a/package/6in4/Makefile +++ b/package/6in4/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=6in4 -PKG_VERSION:=8 +PKG_VERSION:=9 PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk diff --git a/package/6in4/files/6in4.hotplug b/package/6in4/files/6in4.hotplug index 9499296d92..49667a815e 100644 --- a/package/6in4/files/6in4.hotplug +++ b/package/6in4/files/6in4.hotplug @@ -29,11 +29,12 @@ if [ "$ACTION" = ifup ]; then local password config_get password "$cfg" password + uci_set_state network "$cfg" ipaddr "$wanip" + [ -n "$tunnelid" ] && [ -n "$username" ] && [ -n "$password" ] && { [ "${#password}" == 32 -a -z "${password//[a-f0-9]/}" ] || { password="$(echo -n "$password" | md5sum)"; password="${password%% *}" } - uci_set_state network "$cfg" ipaddr "$wanip" ( local url="http://ipv4.tunnelbroker.net/ipv4_end.php?ipv4b=AUTO&user_id=$username&pass=$password&tunnel_id=$tunnelid" @@ -51,6 +52,9 @@ if [ "$ACTION" = ifup ]; then } done )& + } || { + logger -t 6in4-update "Re-establishing tunnel due to change on $INTERFACE ($DEVICE)" + ifup "$cfg" & } } } |