Gives the user the control to select the correct WAN IPv4 address to be used by
the 6rd tunnel when mutiple WAN interfaces are configured
Signed-off-by: Hans Dedecker <dedec...@gmail.com>
---
package/network/ipv6/6rd/Makefile | 2 +-
package/network/ipv6/6rd/files/6rd.sh | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/package/network/ipv6/6rd/Makefile
b/package/network/ipv6/6rd/Makefile
index 19177f1..390e012 100644
--- a/package/network/ipv6/6rd/Makefile
+++ b/package/network/ipv6/6rd/Makefile
@@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=6rd
-PKG_VERSION:=6
+PKG_VERSION:=7
PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/ipv6/6rd/files/6rd.sh
b/package/network/ipv6/6rd/files/6rd.sh
index 58b16c8..db70b5a 100644
--- a/package/network/ipv6/6rd/files/6rd.sh
+++ b/package/network/ipv6/6rd/files/6rd.sh
@@ -26,8 +26,13 @@ proto_6rd_setup() {
( proto_add_host_dependency "$cfg" 0.0.0.0 )
[ -z "$ipaddr" ] && {
- local wanif
- if ! network_find_wan wanif || ! network_get_ipaddr ipaddr
"$wanif"; then
+ local wanif="$tunlink"
+ if [ -z $wanif ] && ! network_find_wan wanif; then
+ proto_notify_error "$cfg" "NO_WAN_LINK"
+ return
+ fi
+
+ if ! network_get_ipaddr ipaddr "$wanif"; then
proto_notify_error "$cfg" "NO_WAN_LINK"
return
fi
--
1.7.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
