mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Try to autodetect if the execution limit needs to be raised on big number of passthrough entries.

Browse Source 
Set the time limit to 0 and restore it back to default value when this is detected.

* Do not leak pipes when reloading ruleset for CP since this will consume available descriptors.
  This has been noted before but considered fixed, this is the real fix actually for dnpipes.
This commit is contained in:
Ermal LUÇI 2015-01-12 12:17:00 +01:00
parent 6a752ca21a
commit 339e2fe5e6
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
etc/inc/captiveportal.inc
View File

@ -194,6 +194,14 @@ function captiveportal_configure_zone($cpcfg) {
} else
captiveportal_syslog("Reconfiguring captive portal({$cpcfg['zone']}).");
if (is_array($cpcfg['passthrumac'])) {
$nentries = count($cpcfg['passthrumac']);
if ($nentries > 2000) {
if (!set_time_limit(0))
log_error("Execution time limit may be reached while reconfiguring zone = {$cpzone} due to many passthrugh entries!");
}
}
/* init ipfw rules */
captiveportal_init_rules(true);
@ -381,6 +389,8 @@ EOD;
}
}
/* XXX: Same as in rc.php_init_setup */
set_time_limit(900);
unlock($captiveportallck);
return 0;
@ -474,6 +484,7 @@ function captiveportal_init_rules($reinit = false) {
captiveportal_load_modules();
mwexec("/sbin/ipfw zone {$cpzoneid} create", true);
captiveportal_flush_dn_ruleno($cpzone);
$cpips = array();
$ifaces = get_configured_interface_list();
@ -1480,6 +1491,26 @@ function captiveportal_free_dn_ruleno($ruleno) {
unlock($cpruleslck);
}
/*
* To avoid allocating more ids than needed to a zone need
* to flush them before loading/creating new ruleset
*/
function captiveportal_flush_dn_ruleno($cpzone) {
global $config, $g;
$cpruleslck = lock("captiveportalrulesdn", LOCK_EX);
if (file_exists("{$g['vardb_path']}/captiveportaldn.rules")) {
$rules = unserialize(file_get_contents("{$g['vardb_path']}/captiveportaldn.rules"));
foreach ($rules as $idx => $zone) {
if ($zone == $cpzone)
$rules[$idx] = false;
}
file_put_contents("{$g['vardb_path']}/captiveportaldn.rules", serialize($rules));
unset($rules);
}
unlock($cpruleslck);
}
function captiveportal_get_dn_passthru_ruleno($value) {
global $config, $g, $cpzone, $cpzoneid;