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

ds-lite: add support for fqdn peeraddrs 

Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45322 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Steven Barth 2015-04-09 08:17:23 +00:00
parent 1a8f907d2d
commit 408328dff3
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/network/ipv6/ds-lite/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ds-lite PKG_NAME:=ds-lite
PKG_VERSION:=4 PKG_VERSION:=5
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/ds-lite define Package/ds-lite
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:=+kmod-ipv6 +kmod-ip6-tunnel DEPENDS:=+kmod-ipv6 +kmod-ip6-tunnel +resolveip
TITLE:=Dual-Stack Lite (DS-Lite) configuration support TITLE:=Dual-Stack Lite (DS-Lite) configuration support
MAINTAINER:=Steven Barth <steven@midlink.org> MAINTAINER:=Steven Barth <steven@midlink.org>
PKGARCH:=all PKGARCH:=all

11
package/network/ipv6/ds-lite/files/dslite.sh
View File

@ -25,6 +25,17 @@ proto_dslite_setup() {
( proto_add_host_dependency "$cfg" "::" "$tunlink" ) ( proto_add_host_dependency "$cfg" "::" "$tunlink" )
peeraddr=$(resolveip -6 $peeraddr)
if [ -z "$peeraddr" ]; then
sleep 3
peeraddr=$(resolveip -6 $peeraddr)
if [ -z "$peeraddr" ]; then
proto_notify_error "$cfg" "AFTR_DNS_FAIL"
return
fi
fi
peeraddr="${peeraddr%% *}"
[ -z "$ip6addr" ] && { [ -z "$ip6addr" ] && {
local wanif="$tunlink" local wanif="$tunlink"
if [ -z "$wanif" ] && ! network_find_wan6 wanif; then if [ -z "$wanif" ] && ! network_find_wan6 wanif; then