hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

6in4: re-establish tunnel also if no credentials are used (static setup) 

SVN-Revision: 25627
owl
Jo-Philipp Wich 2011-02-20 18:27:19 +00:00
parent 84c1a05826
commit 7f75ed2939
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/6in4/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=6in4 PKG_NAME:=6in4
PKG_VERSION:=8 PKG_VERSION:=9
PKG_RELEASE:=1 PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

6
package/6in4/files/6in4.hotplug
View File

@ -29,11 +29,12 @@ if [ "$ACTION" = ifup ]; then
local password local password
config_get password "$cfg" password config_get password "$cfg" password
uci_set_state network "$cfg" ipaddr "$wanip"
[ -n "$tunnelid" ] && [ -n "$username" ] && [ -n "$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%% *}" 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" 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 done
)& )&
} || {
logger -t 6in4-update "Re-establishing tunnel due to change on $INTERFACE ($DEVICE)"
ifup "$cfg" &
} }
} }
} }