diff options
| -rw-r--r-- | etc/inc/captiveportal.inc | 19 | ||||
| -rwxr-xr-x | usr/local/www/services_captiveportal.php | 16 |
2 files changed, 0 insertions, 35 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index d9690ea..d8872a9 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -384,24 +384,6 @@ EOD; mwexec("/sbin/sysctl net.link.ether.ipfw=0"); } - - /* unload ipfw */ - $listifs = get_configured_interface_list(); - $cpinterfaces = explode(",", $config['captiveportal'][$cpzone]['interface']); - foreach ($cpinterfaces as $cpifgrp) { - if (!isset($listifs[$cpifgrp])) - continue; - $listrealif = get_real_interface($cpifgrp); - if (does_interface_exist($listrealif)) { - pfSense_interface_flags($listrealif, -IFF_IPFW_FILTER); - $carpif = link_ip_to_carp_interface(find_interface_ip($listrealif)); - if (!empty($carpif)) { - $carpsif = explode(" ", $carpif); - foreach ($carpsif as $cpcarp) - pfSense_interface_flags($cpcarp, -IFF_IPFW_FILTER); - } - } - } } unlock($captiveportallck); @@ -491,7 +473,6 @@ function captiveportal_init_rules($reinit = false) { $carpsif = explode(" ", $carpif); foreach ($carpsif as $cpcarp) { mwexec("/usr/local/sbin/ipfw_context -a {$cpzone} -n {$cpcarp}", true); - pfSense_interface_flags($cpcarp, IFF_IPFW_FILTER); $carpip = find_interface_ip($cpcarp); if (is_ipaddr($carpip)) $cpips[] = $carpip; diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index c421e80..8a47911 100755 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -316,22 +316,6 @@ if ($_POST) { write_config(); - if (!empty($oldifaces) && $oldifaces != $newcp['interface']) { - $ocpinterfaces = explode(",", $oldifaces); - foreach ($ocpinterfaces as $cpifgrp) { - $listrealif = get_real_interface($cpifgrp); - if (does_interface_exist($listrealif)) { - pfSense_interface_flags($listrealif, -IFF_IPFW_FILTER); - $carpif = link_ip_to_carp_interface(find_interface_ip($listrealif)); - if (!empty($carpif)) { - $carpsif = explode(" ", $carpif); - foreach ($carpsif as $cpcarp) - pfSense_interface_flags($cpcarp, -IFF_IPFW_FILTER); - } - } - } - } - captiveportal_configure_zone($newcp); filter_configure(); header("Location: services_captiveportal_zones.php"); |
