From 7502d7e178253a0361f2810fb49da26358db7eff Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 17 Oct 2011 12:45:53 +0000 Subject: [PATCH] [backfire] 6in4: merge r28475 git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@28476 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/6in4/Makefile | 4 ++-- package/6in4/files/6in4.hotplug | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/6in4/Makefile b/package/6in4/Makefile index 65b10542e..2bfc325a1 100644 --- a/package/6in4/Makefile +++ b/package/6in4/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=6in4 -PKG_VERSION:=9 -PKG_RELEASE:=2 +PKG_VERSION:=10 +PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk diff --git a/package/6in4/files/6in4.hotplug b/package/6in4/files/6in4.hotplug index 9df993498..3d9def448 100644 --- a/package/6in4/files/6in4.hotplug +++ b/package/6in4/files/6in4.hotplug @@ -37,12 +37,12 @@ if [ "$ACTION" = ifup ]; then uci_set_state network "$cfg" ipaddr "$wanip" [ -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%% *}" } ( - 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 max=3 -- 2.35.1