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

6in4: add support for he.net updatekey 

SVN-Revision: 39646
owl
Steven Barth 2014-02-20 21:36:15 +00:00
parent 223c6808ba
commit 12fa3eae23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/ipv6/6in4/Makefile
View File

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

9
package/network/ipv6/6in4/files/6in4.sh
View File

@ -14,8 +14,8 @@ proto_6in4_setup() {
local iface="$2" local iface="$2"
local link="6in4-$cfg" local link="6in4-$cfg"
local mtu ttl ipaddr peeraddr ip6addr ip6prefix tunnelid username password sourcerouting local mtu ttl ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey sourcerouting
json_get_vars mtu ttl ipaddr peeraddr ip6addr ip6prefix tunnelid username password sourcerouting json_get_vars mtu ttl ipaddr peeraddr ip6addr ip6prefix tunnelid username password updatekey sourcerouting
[ -z "$peeraddr" ] && { [ -z "$peeraddr" ] && {
proto_notify_error "$cfg" "MISSING_ADDRESS" proto_notify_error "$cfg" "MISSING_ADDRESS"
@ -62,11 +62,13 @@ proto_6in4_setup() {
proto_send_update "$cfg" 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}" == 32 -a -z "${password//[a-fA-F0-9]/}" ] || {
password="$(echo -n "$password" | md5sum)"; password="${password%% *}" password="$(echo -n "$password" | md5sum)"; password="${password%% *}"
} }
[ -n "$updatekey" ] && password="$updatekey"
local url="http://ipv4.tunnelbroker.net/ipv4_end.php?ip=AUTO&apikey=$username&pass=$password&tid=$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
@ -95,6 +97,7 @@ proto_6in4_init_config() {
proto_config_add_string "tunnelid" proto_config_add_string "tunnelid"
proto_config_add_string "username" proto_config_add_string "username"
proto_config_add_string "password" proto_config_add_string "password"
proto_config_add_string "updatekey"
proto_config_add_int "mtu" proto_config_add_int "mtu"
proto_config_add_int "ttl" proto_config_add_int "ttl"
proto_config_add_boolean "sourcerouting" proto_config_add_boolean "sourcerouting"