From 462e25e21cab5a751ed9c90bac563c52fdf9c025 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 29 May 2014 09:42:25 +0000
Subject: [PATCH] AA: 6in4: backport r39646 and r40876 (#15054, #16617)

SVN-Revision: 40877
---
 package/6in4/Makefile      |  4 ++--
 package/6in4/files/6in4.sh | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/package/6in4/Makefile b/package/6in4/Makefile
index 7090234358..47f27f6979 100644
--- a/package/6in4/Makefile
+++ b/package/6in4/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010-2012 OpenWrt.org
+# Copyright (C) 2010-2014 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6in4
-PKG_VERSION:=14
+PKG_VERSION:=16
 PKG_RELEASE:=1
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/6in4/files/6in4.sh b/package/6in4/files/6in4.sh
index 647a2f89cf..165056cdb0 100755
--- a/package/6in4/files/6in4.sh
+++ b/package/6in4/files/6in4.sh
@@ -14,8 +14,8 @@ proto_6in4_setup() {
 	local iface="$2"
 	local link="6in4-$cfg"
 
-	local mtu ttl ipaddr peeraddr ip6addr ip6prefix tunnelid username password
-	json_get_vars mtu ttl ipaddr peeraddr ip6addr ip6prefix tunnelid username password
+	local mtu ttl ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey
+	json_get_vars mtu ttl ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey
 
 	[ -z "$peeraddr" ] && {
 		proto_notify_error "$cfg" "MISSING_ADDRESS"
@@ -55,12 +55,14 @@ proto_6in4_setup() {
 
 	proto_send_update "$cfg"
 
-	[ -n "$tunnelid" -a -n "$username" -a -n "$password" ] && {
+	[ -n "$tunnelid" -a -n "$username" -a \( -n "$password" -o -n "$updatekey" \) ] && {
 		[ "${#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?ip=AUTO&apikey=$username&pass=$password&tid=$tunnelid"
+		[ -n "$updatekey" ] && password="$updatekey"
+
+		local url="http://ipv4.tunnelbroker.net/nic/update?username=$username&password=$password&hostname=$tunnelid"
 		local try=0
 		local max=3
 
@@ -88,6 +90,7 @@ proto_6in4_init_config() {
 	proto_config_add_string "tunnelid"
 	proto_config_add_string "username"
 	proto_config_add_string "password"
+	proto_config_add_string "updatekey"
 	proto_config_add_int "mtu"
 	proto_config_add_int "ttl"
 }
-- 
2.30.2