summaryrefslogtreecommitdiffstats
path: root/usr/local/pkg
diff options
context:
space:
mode:
authorRenato Botelho <garga@FreeBSD.org>2014-09-19 16:53:48 -0300
committerRenato Botelho <garga@FreeBSD.org>2014-09-19 16:53:48 -0300
commit8718669cafdb241a7b801489ba0d6dd20f8d1e7e (patch)
tree7a76e84b9631dcecda46ccd1162f28c7b5ac6525 /usr/local/pkg
parentde29dadc20688daa579937fbd8b4dfdcae3587e6 (diff)
downloadpfsense-8718669cafdb241a7b801489ba0d6dd20f8d1e7e.zip
pfsense-8718669cafdb241a7b801489ba0d6dd20f8d1e7e.tar.gz
Recent versions of miniupnpd does not accept IPv4 address anymore, use interface name always. It fixes #3874
Diffstat (limited to 'usr/local/pkg')
-rw-r--r--usr/local/pkg/miniupnpd.inc5
-rw-r--r--usr/local/pkg/miniupnpd.xml7
2 files changed, 2 insertions, 10 deletions
diff --git a/usr/local/pkg/miniupnpd.inc b/usr/local/pkg/miniupnpd.inc
index 31067d0..4cad0e5 100644
--- a/usr/local/pkg/miniupnpd.inc
+++ b/usr/local/pkg/miniupnpd.inc
@@ -159,10 +159,7 @@
$bits = find_interface_subnet($if);
/* check that the interface has an ip address before adding parameters */
if (is_ipaddr($addr)) {
- if ($upnp_config['listen_on_iface'])
- $config_text .= "listening_ip={$if}\n";
- else
- $config_text .= "listening_ip={$addr}/{$bits}\n";
+ $config_text .= "listening_ip={$if}\n";
if(!$ifaces_active) {
$webgui_ip = $addr;
$ifaces_active = $iface;
diff --git a/usr/local/pkg/miniupnpd.xml b/usr/local/pkg/miniupnpd.xml
index d829210..9aa0239 100644
--- a/usr/local/pkg/miniupnpd.xml
+++ b/usr/local/pkg/miniupnpd.xml
@@ -35,7 +35,7 @@
<field>
<name>UPnP &amp; NAT-PMP Settings</name>
<type>listtopic</type>
- <enablefields>enable_upnp,enable_natpmp,listen_on_iface,iface_array,overridewanip,upnpqueue,logpackets,sysuptime,permdefault,permuser1,permuser2,permuser3,permuser4</enablefields>
+ <enablefields>enable_upnp,enable_natpmp,iface_array,overridewanip,upnpqueue,logpackets,sysuptime,permdefault,permuser1,permuser2,permuser3,permuser4</enablefields>
</field>
<field>
<fielddescr>Enable UPnP &amp; NAT-PMP</fielddescr>
@@ -81,11 +81,6 @@
<required/>
</field>
<field>
- <fielddescr>Listen on interface instead of interface's IPv4 address</fielddescr>
- <fieldname>listen_on_iface</fieldname>
- <type>checkbox</type>
- </field>
- <field>
<fielddescr>Maximum Download Speed (Kbits/second)</fielddescr>
<fieldname>download</fieldname>
<type>input</type>
OpenPOWER on IntegriCloud