summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-20 18:27:19 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-02-20 18:27:19 +0000
commit5a636bea987c9906668efd96513456eb87a4f99c (patch)
treef796bab3517d7f7640ef3ee5288ad25c79a729b3
parent334c0f6e199dbd31062a33a7ff55a1f36624697e (diff)
[package] 6in4: re-establish tunnel also if no credentials are used (static setup)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25627 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/6in4/Makefile2
-rw-r--r--package/6in4/files/6in4.hotplug6
2 files changed, 6 insertions, 2 deletions
diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index 905d7f810..9a2cfe20d 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 9499296d9..49667a815 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" &
}
}
}