From c52839436a5bfc6d53eec8916312298e048ff364 Mon Sep 17 00:00:00 2001 From: Self-Hosting-Group <155233284+Self-Hosting-Group@users.noreply.github.com> Date: Wed, 24 Jan 2024 17:20:36 +0100 Subject: [PATCH] net/upnp: Update plugin wording to include PCP as supported (#3769) and also mention `UPnP IGD` as `UPnP` is probably not specific enough. Port Control Protocol (PCP) is the successor to NAT-PMP and has similar protocol concepts and packet formats, but adds IPv6 support. PCP standard: https://datatracker.ietf.org/doc/html/rfc6887 https://en.wikipedia.org/wiki/Port_Control_Protocol NAT-PMP std. (see 9.1 Simplicity - 9.3 for some diff. to UPnP IGD): https://datatracker.ietf.org/doc/html/rfc6886 --- net/upnp/Makefile | 4 ++-- net/upnp/pkg-descr | 8 ++++---- .../src/etc/inc/plugins.inc.d/miniupnpd.inc | 2 +- net/upnp/src/www/services_upnp.php | 18 +++++++++--------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/net/upnp/Makefile b/net/upnp/Makefile index b43908434..ad55189cf 100644 --- a/net/upnp/Makefile +++ b/net/upnp/Makefile @@ -1,8 +1,8 @@ PLUGIN_NAME= upnp PLUGIN_VERSION= 1.5 -PLUGIN_REVISION= 5 +PLUGIN_REVISION= 6 PLUGIN_DEPENDS= miniupnpd -PLUGIN_COMMENT= Universal Plug and Play Service +PLUGIN_COMMENT= Universal Plug and Play (UPnP IGD & PCP/NAT-PMP) Service PLUGIN_MAINTAINER= franco@opnsense.org .include "../../Mk/plugins.mk" diff --git a/net/upnp/pkg-descr b/net/upnp/pkg-descr index fc73e6b00..283b27ae7 100644 --- a/net/upnp/pkg-descr +++ b/net/upnp/pkg-descr @@ -1,8 +1,8 @@ -Mini UPnPd is a lightweight implementation of a UPnP IGD daemon. This is -supposed to be run on your gateway machine to allow client systems to redirect -ports and punch holes in the firewall. +MiniUPnPd is a lightweight implementation of a UPnP IGD & PCP/NAT-PMP daemon. +This is supposed to be run on your gateway machine to allow client systems to +map ports and punch holes in the firewall. -WWW: http://miniupnp.free.fr/ +WWW: https://miniupnp.tuxfamily.org/ Plugin Changelog ================ diff --git a/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc b/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc index 411c57f66..54a44a6c6 100644 --- a/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc +++ b/net/upnp/src/etc/inc/plugins.inc.d/miniupnpd.inc @@ -230,7 +230,7 @@ function miniupnpd_configure_do($verbose = false) $config_text .= "deny 0-65535 0.0.0.0/0 0-65535\n"; } - /* Allow UPnP or NAT-PMP as requested */ + /* Allow UPnP IGD or PCP/NAT-PMP as requested */ $config_text .= "enable_upnp=" . ( $upnp_config['enable_upnp'] ? "yes\n" : "no\n" ); $config_text .= "enable_natpmp=" . ( $upnp_config['enable_natpmp'] ? "yes\n" : "no\n" ); diff --git a/net/upnp/src/www/services_upnp.php b/net/upnp/src/www/services_upnp.php index 5ca0754f1..077c3bae7 100644 --- a/net/upnp/src/www/services_upnp.php +++ b/net/upnp/src/www/services_upnp.php @@ -102,7 +102,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { // validate form data if (!empty($pconfig['enable']) && (empty($pconfig['enable_upnp']) && empty($pconfig['enable_natpmp']))) { - $input_errors[] = gettext('At least one of \'UPnP\' or \'NAT-PMP\' must be allowed'); + $input_errors[] = gettext('At least one of \'UPnP IGD\' or \'PCP/NAT-PMP\' must be allowed'); } if (!empty($pconfig['iface_array'])) { foreach($pconfig['iface_array'] as $iface) { @@ -210,7 +210,7 @@ include("head.inc"); - + @@ -227,7 +227,7 @@ include("head.inc"); - + />