diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-03-09 13:53:29 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-03-09 13:53:29 +0100 |
| commit | 15f2cdc31714fe2fa4c17f1d37d156ca1fa6dba5 (patch) | |
| tree | 1218fd569047e461a9a6df82151d26a88687677e /etc/inc | |
| parent | a3dd71ee67cb88331df9c5167422879bf59389b0 (diff) | |
| parent | 272c5d62061f23d60525df1ac6b69f966df6a5cc (diff) | |
| download | pfsense-15f2cdc31714fe2fa4c17f1d37d156ca1fa6dba5.zip pfsense-15f2cdc31714fe2fa4c17f1d37d156ca1fa6dba5.tar.gz | |
Merge remote branch 'upstream/master'
Conflicts:
usr/local/www/status_rrd_graph_img.php
usr/local/www/themes/pfsense_ng/rrdcolors.inc.php
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/filter.inc | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 1419f86..3364665 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -2513,10 +2513,37 @@ EOD; $ipfrules .= <<<EOD anchor "tftp-proxy/*" +EOD; + + update_filter_reload_status("Creating uPNP rules..."); + if(isset($config['installedpackages']['miniupnpd']['config'][0]['enable'])) { + + $ipfrules .= <<<EOD # uPnPd anchor "miniupnpd" EOD; + + $upnp_interfaces = explode(",", $config['installedpackages']['miniupnpd']['config']['iface_array']); + foreach($upnp_interfaces as $upnp_if) { + if(is_array($FilterIflist[$upnp_if])) { + $oc = $FilterIflist[$upnp_if]; + if($oc['ip']) { + $sa = $oc['sa']; + $sn = $oc['sn']; + $if = $oc['if']; + } + if($sa) { + $ipfrules .= <<<EOD + +pass in quick on \${$oc['descr']} proto tcp from {$sa}/{$sn} to 239.255.255.250/32 port 1900 flags any keep state label "pass multicast traffic to miniupnpd" + +EOD; + } + } + } + } + return $ipfrules; } |
