diff options
author | Darren Embry <dse@webonastick.com> | 2012-05-03 12:34:12 -0400 |
---|---|---|
committer | Darren Embry <dse@webonastick.com> | 2012-05-03 12:34:12 -0400 |
commit | 470d24a39d8a4cdaf7a85aeb71d7a7d802d76879 (patch) | |
tree | ae9f13c5b357e28b7de1cb89e6fcb8edc38d2c7b /etc/inc/filter.inc | |
parent | 6b2d4b5a05c347f2c56a815c4ae7f4053b082597 (diff) | |
download | pfsense-470d24a39d8a4cdaf7a85aeb71d7a7d802d76879.zip pfsense-470d24a39d8a4cdaf7a85aeb71d7a7d802d76879.tar.gz |
implement #2407: create config option for captive portal listening port
Diffstat (limited to 'etc/inc/filter.inc')
-rw-r--r-- | etc/inc/filter.inc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 4adc527..3cbfe61 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -2478,8 +2478,10 @@ EOD; if (count($cpiplist) > 0 && count($cpiflist) > 0) { $cpinterface = implode(" ", $cpiflist); $cpaddresses = implode(" ", $cpiplist); - $portalias = $cpcfg['zoneid'] + 1; - $portalias .= " {$cpcfg['zoneid']}"; + $listenporthttps = $cpcfg['listenporthttps'] ? $cpcfg['listenporthttps'] : ($cpcfg['zoneid'] + 1); + $listenporthttp = $cpcfg['listenporthttp'] ? $cpcfg['listenporthttp'] : $cpcfg['zoneid']; + $portalias = $listenporthttps; + $portalias .= " {$listenporthttp}"; $ipfrules .= "pass in {$log} quick on { {$cpinterface} } proto tcp from any to { {$cpaddresses} } port { {$portalias} } keep state(sloppy)\n"; $ipfrules .= "pass out {$log} quick on { {$cpinterface} } proto tcp from any to any flags any keep state(sloppy)\n"; } |