AA: 6in4: backport r39646 and r40876 (#15054, #16617)

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@40877 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 7 insertions, 4 deletions

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"
 }