Author: cyrus
Date: 2015-04-09 10:17:23 +0200 (Thu, 09 Apr 2015)
New Revision: 45322

Modified:
   trunk/package/network/ipv6/ds-lite/Makefile
   trunk/package/network/ipv6/ds-lite/files/dslite.sh
Log:
ds-lite: add support for fqdn peeraddrs

Signed-off-by: Steven Barth <[email protected]>

Modified: trunk/package/network/ipv6/ds-lite/Makefile
===================================================================
--- trunk/package/network/ipv6/ds-lite/Makefile 2015-04-09 08:02:33 UTC (rev 
45321)
+++ trunk/package/network/ipv6/ds-lite/Makefile 2015-04-09 08:17:23 UTC (rev 
45322)
@@ -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 @@
 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 <[email protected]>
   PKGARCH:=all

Modified: trunk/package/network/ipv6/ds-lite/files/dslite.sh
===================================================================
--- trunk/package/network/ipv6/ds-lite/files/dslite.sh  2015-04-09 08:02:33 UTC 
(rev 45321)
+++ trunk/package/network/ipv6/ds-lite/files/dslite.sh  2015-04-09 08:17:23 UTC 
(rev 45322)
@@ -25,6 +25,17 @@
 
        ( 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
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to