summaryrefslogtreecommitdiffstats
path: root/usr/local/pkg
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2013-01-04 12:37:27 -0500
committerjim-p <jimp@pfsense.org>2013-01-04 12:37:27 -0500
commita2b1d1e89cb43680a05df1068e855a5f506f2b2c (patch)
tree3dd9133fc31684ab10763f520dcb168fd1ae0c58 /usr/local/pkg
parentd0fc4479d5f89e7078fc1d8e76ce6bfb4bb63cb7 (diff)
downloadpfsense-a2b1d1e89cb43680a05df1068e855a5f506f2b2c.zip
pfsense-a2b1d1e89cb43680a05df1068e855a5f506f2b2c.tar.gz
This seems to break upnp for IPv4 in other ways, and we have since disabled IPv6 in the daemon while compiling anyhow. Revert "In order for miniupnpd to latch onto IPv6, we just need to give the interface name here, not the subnet. The daemon is smart enough to latch onto the right subnet(s) here anyhow."
This reverts commit bc8a1938f5c1797213bf849f2bdb88bca72d5089.
Diffstat (limited to 'usr/local/pkg')
-rw-r--r--usr/local/pkg/miniupnpd.inc3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/local/pkg/miniupnpd.inc b/usr/local/pkg/miniupnpd.inc
index ed46dbe..92c0ab0 100644
--- a/usr/local/pkg/miniupnpd.inc
+++ b/usr/local/pkg/miniupnpd.inc
@@ -138,9 +138,10 @@
/* above function returns iface if fail */
if($if!=$iface) {
$addr = find_interface_ip($if);
+ $bits = find_interface_subnet($if);
/* check that the interface has an ip address before adding parameters */
if (is_ipaddr($addr)) {
- $config_text .= "listening_ip={$if}\n";
+ $config_text .= "listening_ip={$addr}/{$bits}\n";
if(!$ifaces_active) {
$webgui_ip = $addr;
$ifaces_active = $iface;
OpenPOWER on IntegriCloud