6in4: sync with HE.net endpoint update changes

SVN-Revision: 28475
This commit is contained in:
Jo-Philipp Wich 2011-10-17 12:45:07 +00:00
parent d8d9130e45
commit b656b87d13
2 changed files with 4 additions and 4 deletions

View file

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

View file

@ -37,12 +37,12 @@ if [ "$ACTION" = ifup ]; then
uci_set_state network "$cfg" ipaddr "$wanip" 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-fA-F0-9]/}" ] || {
password="$(echo -n "$password" | md5sum)"; password="${password%% *}" password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
} }
( (
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?ip=AUTO&apikey=$username&pass=$password&tid=$tunnelid"
local try=0 local try=0
local max=3 local max=3