diff options
| author | Steven Barth <steven@midlink.org> | 2015-04-09 08:17:23 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2015-04-09 08:17:23 +0000 |
| commit | 408328dff3def5cb4389c1c79a863e0061a47ee2 (patch) | |
| tree | 57923dcd2a88cb8f96df03e68a739e6a1335c885 /package/network/ipv6 | |
| parent | 1a8f907d2d73e6d2a2379ff33bed7ab07cadbeec (diff) | |
| download | upstream-408328dff3def5cb4389c1c79a863e0061a47ee2.tar.gz upstream-408328dff3def5cb4389c1c79a863e0061a47ee2.tar.bz2 upstream-408328dff3def5cb4389c1c79a863e0061a47ee2.zip | |
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
Diffstat (limited to 'package/network/ipv6')
| -rw-r--r-- | package/network/ipv6/ds-lite/Makefile | 4 | ||||
| -rwxr-xr-x | package/network/ipv6/ds-lite/files/dslite.sh | 11 |
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 |