aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2015-04-09 08:17:23 +0000
committerSteven Barth <cyrus@openwrt.org>2015-04-09 08:17:23 +0000
commitd5a477cc38c319ddc89428594c7db98d27f590bb (patch)
treea4cb67bfe2250572d861291a36de5eb0020e8f97
parentc99d9afff3b0863b0425fc65bb2b254bc6863556 (diff)
downloadupstream-d5a477cc38c319ddc89428594c7db98d27f590bb.tar.gz
upstream-d5a477cc38c319ddc89428594c7db98d27f590bb.tar.bz2
upstream-d5a477cc38c319ddc89428594c7db98d27f590bb.zip
ds-lite: add support for fqdn peeraddrs
Signed-off-by: Steven Barth <steven@midlink.org> SVN-Revision: 45322
-rw-r--r--package/network/ipv6/ds-lite/Makefile4
-rwxr-xr-xpackage/network/ipv6/ds-lite/files/dslite.sh11
2 files changed, 13 insertions, 2 deletions
diff --git a/package/network/ipv6/ds-lite/Makefile b/package/network/ipv6/ds-lite/Makefile
index 4a3d1b38cd..79b49feec3 100644
--- a/package/network/ipv6/ds-lite/Makefile
+++ b/package/network/ipv6/ds-lite/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ds-lite
-PKG_VERSION:=4
+PKG_VERSION:=5
PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0
@@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
define Package/ds-lite
SECTION:=net
CATEGORY:=Network
- DEPENDS:=+kmod-ipv6 +kmod-ip6-tunnel
+ DEPENDS:=+kmod-ipv6 +kmod-ip6-tunnel +resolveip
TITLE:=Dual-Stack Lite (DS-Lite) configuration support
MAINTAINER:=Steven Barth <steven@midlink.org>
PKGARCH:=all
diff --git a/package/network/ipv6/ds-lite/files/dslite.sh b/package/network/ipv6/ds-lite/files/dslite.sh
index a526c91d31..7b686390b3 100755
--- a/package/network/ipv6/ds-lite/files/dslite.sh
+++ b/package/network/ipv6/ds-lite/files/dslite.sh
@@ -25,6 +25,17 @@ proto_dslite_setup() {
( 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" ] && {
local wanif="$tunlink"
if [ -z "$wanif" ] && ! network_find_wan6 wanif; then