From: Jitao Lu <dianlujitao@gmail.com>
Date: Thu, 3 Dec 2020 15:36:09 +0000 (+0800)
Subject: miniupnpd: Pass ipv6 addr to ipv6_listening_ip
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=refs%2Fpull%2F14125%2Fhead;p=feed%2Fpackages.git

miniupnpd: Pass ipv6 addr to ipv6_listening_ip

Unlike ipv4, this option is supposed to be an IP address, otherwise, an
error occurs on startup:

    can't parse "br-lan" as valid IPv6 listening address

Signed-off-by: Jitao Lu <dianlujitao@gmail.com>
---

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index 0a99b415f7..f69c317771 100644
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=2.2.0
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
diff --git a/net/miniupnpd/files/miniupnpd.init b/net/miniupnpd/files/miniupnpd.init
index 71c1dffe65..901ca8b4e7 100644
--- a/net/miniupnpd/files/miniupnpd.init
+++ b/net/miniupnpd/files/miniupnpd.init
@@ -131,9 +131,9 @@ upnpd() {
 
 		local iface
 		for iface in ${internal_iface:-lan}; do
-			local device
+			local device addr6
 			network_get_device device "$iface" && echo "listening_ip=$device"
-			network_get_device device "$iface" && echo "ipv6_listening_ip=$device"
+			network_get_ipaddr6 addr6 "$iface" && echo "ipv6_listening_ip=$addr6"
 		done
 
 		config_load "upnpd"