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

6in4: use uclient-fetch instead of wget/curl 

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48391
lede-17.01
Felix Fietkau 2016-01-20 10:15:29 +00:00
parent 8353ed85f2
commit 99856ebf5c
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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:=22 PKG_VERSION:=23
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0
@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/6in4 define Package/6in4
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=@IPV6 +kmod-sit DEPENDS:=@IPV6 +kmod-sit +uclient-fetch
TITLE:=IPv6-in-IPv4 configuration support TITLE:=IPv6-in-IPv4 configuration support
MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org> MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
PKGARCH:=all PKGARCH:=all

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

@ -82,40 +82,23 @@ proto_6in4_setup() {
[ -n "$updatekey" ] && password="$updatekey" [ -n "$updatekey" ] && password="$updatekey"
local http="http" local http="http"
local urlget="wget" local urlget="uclient-fetch"
local urlget_opts="-qO-" local urlget_opts="-qO-"
local ca_path="${SSL_CERT_DIR-/etc/ssl/certs}" local ca_path="${SSL_CERT_DIR-/etc/ssl/certs}"
if [ -n "$(which curl)" ]; then [ -f /lib/libustream-ssl.so ] && http=https
urlget="curl"
urlget_opts="-s -S"
if curl -V | grep "Protocols:" | grep -qF "https"; then
http="https"
urlget_opts="$urlget_opts --capath $ca_path"
fi
fi
if [ "$http" = "http" ] &&
wget --version 2>&1 | grep -qF "+https"; then
urlget="wget"
urlget_opts="-qO- --ca-directory=$ca_path"
http="https"
fi
[ "$http" = "https" -a -z "$(find $ca_path -name "*.0" 2>/dev/null)" ] && { [ "$http" = "https" -a -z "$(find $ca_path -name "*.0" 2>/dev/null)" ] && {
if [ "$urlget" = "curl" ]; then urlget_opts="$urlget_opts --no-check-certificate"
urlget_opts="$urlget_opts -k"
else
urlget_opts="$urlget_opts --no-check-certificate"
fi
} }
local url="$http://ipv4.tunnelbroker.net/nic/update?username=$username&password=$password&hostname=$tunnelid" local url="$http://ipv4.tunnelbroker.net/nic/update?hostname=$tunnelid"
local try=0 local try=0
local max=3 local max=3
( (
set -o pipefail set -o pipefail
while [ $((++try)) -le $max ]; do while [ $((++try)) -le $max ]; do
if proto_6in4_update $urlget $urlget_opts "$url" 2>&1 | \ if proto_6in4_update $urlget $urlget_opts --user="$username" --password="$password" "$url" 2>&1 | \
sed -e 's,^Killed$,timeout,' -e "s,^,update $try/$max: ," | \ sed -e 's,^Killed$,timeout,' -e "s,^,update $try/$max: ," | \
logger -t "$link"; logger -t "$link";
then then