miniupnpd: enable IPv6 leases file

Introduces the IPv6 Leases file by default. This file will display active IPv6 leases requested under the IPv6 PCP (Port Control Protocol) a.k.a IPv6 Pinholes.

miniupnpd must be compiled with ENABLE_UPNPPINHOLE set for this to take effect. This is taken care of currently by setting CONFIG_IPV6.
The lease file looks something like
Proto;ClientIP;ClientPort;RemoteIP;RemotePort;UID;Timestamp;Description

Signed-off-by: Michael Gray <redacted>

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index c34ca948ce37a5ea6d9b2b93bfa12aead95b1375..8fa98ebde426cffd49979375d17adab4a1e372c5 100644 (file)
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=2.3.9
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=https://github.com/miniupnp/miniupnp/releases/download/miniupnpd_$(subst .,_,$(PKG_VERSION))
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/net/miniupnpd/files/miniupnpd.init b/net/miniupnpd/files/miniupnpd.init
index 15bd2e0f9d45b8e7eeacf5cba7ad0fa7ba53434e..bb15b15cb98f3e2140bd7a565b3c1f3ec6ca5251 100644 (file)
--- a/net/miniupnpd/files/miniupnpd.init
+++ b/net/miniupnpd/files/miniupnpd.init
@@ -61,7 +61,7 @@ upnpd() {
        local external_iface external_iface6 external_zone external_ip internal_iface
        local upload download log_output port config_file serial_number model_number
        local use_stun stun_host stun_port uuid notify_interval presentation_url
-       local upnp_lease_file ipv6_disable
+       local upnp_lease_file upnp_lease_file6 ipv6_disable
 
        local enabled
        config_get_bool enabled config enabled 1
@@ -86,6 +86,7 @@ upnpd() {
        config_get notify_interval config notify_interval
        config_get presentation_url config presentation_url
        config_get upnp_lease_file config upnp_lease_file
+       config_get upnp_lease_file6 config upnp_lease_file6
        config_get ipv6_disable config ipv6_disable 0
 
        local conf ifname ifname6
@@ -151,6 +152,7 @@ upnpd() {
                }
 
                [ -n "$upnp_lease_file" ] && touch "$upnp_lease_file" && echo "lease_file=$upnp_lease_file"
+               [ -n "$upnp_lease_file6" ] && touch "$upnp_lease_file6" && echo "lease_file6=$upnp_lease_file6"
                [ -n "$presentation_url" ] && echo "presentation_url=$presentation_url"
                [ -n "$notify_interval" ] && echo "notify_interval=$notify_interval"
                [ -n "$serial_number" ] && echo "serial=$serial_number"

diff --git a/net/miniupnpd/files/upnpd.config b/net/miniupnpd/files/upnpd.config
index bd7c3ec4007dce6b916f7895822964e67458b3a9..c4546e018f5de7b74c5340bee1ab36b7b1fca598 100644 (file)
--- a/net/miniupnpd/files/upnpd.config
+++ b/net/miniupnpd/files/upnpd.config
@@ -11,6 +11,7 @@ config upnpd config
        option internal_iface   lan
        option port             5000
        option upnp_lease_file  /var/run/miniupnpd.leases
+       option upnp_lease_file6 /var/run/miniupnpd.leases6
        option igdv1            1
 
 config perm_rule