Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

6in4: https support for he.net tunnel api

Browse source 
HE.net tunnel update API requests are now made via https if an
SSL-capable wget is installed.  Certificate validation is
conditionally enabled if the CA certs are available.

Signed-off-by: Andrew Skalski <askalski@gmail.com>

SVN-Revision: 43124
This commit is contained in:
Steven Barth 2014-10-30 13:15:18 +00:00
parent 6a4a437e04
commit 8f877ff42b
2 changed files with 12 additions and 3 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:=17 PKG_VERSION:=18
PKG_RELEASE:=1 PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

13
package/network/ipv6/6in4/files/6in4.sh
View file

@ -66,12 +66,21 @@ proto_6in4_setup() {
[ -n "$tunnelid" -a -n "$username" -a \( -n "$password" -o -n "$updatekey" \) ] && { [ -n "$tunnelid" -a -n "$username" -a \( -n "$password" -o -n "$updatekey" \) ] && {
[ -n "$updatekey" ] && password="$updatekey" [ -n "$updatekey" ] && password="$updatekey"
local url="http://ipv4.tunnelbroker.net/nic/update?username=$username&password=$password&hostname=$tunnelid" local http="http"
local wget_opts="-qO/dev/null"
if wget --version | grep -qF "+https"; then
http="https"
[ -z "$(find ${SSL_CERT_DIR-/etc/ssl/certs} -name "*.0" 2>/dev/null)" ] && {
wget_opts="$wget_opts --no-check-certificate"
}
fi
local url="$http://ipv4.tunnelbroker.net/nic/update?username=$username&password=$password&hostname=$tunnelid"
local try=0 local try=0
local max=3 local max=3
while [ $((++try)) -le $max ]; do while [ $((++try)) -le $max ]; do
( exec wget -qO/dev/null "$url" 2>/dev/null ) & ( exec wget $wget_opts "$url" 2>/dev/null ) &
local pid=$! local pid=$!
( sleep 5; kill $pid 2>/dev/null ) & ( sleep 5; kill $pid 2>/dev/null ) &
wait $pid && break wait $pid && break