lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 16:44:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

prevent ipfw modules for CP from getting loaded when not enabled

Browse Source
This commit is contained in:
Ad Schellevis 2015-02-21 12:28:38 +00:00
parent 227a53ba29
commit 9f39b41b22
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/etc/inc/captiveportal.inc
View File

@ -237,15 +237,14 @@ function captiveportal_get_last_activity($ip, $mac = NULL) {
/* reinit will disconnect all users, be careful! */
function captiveportal_init_rules($reinit = false) {
// load modules
captiveportal_load_modules();
//
// if ( $reinit ) {
$cpc = new OPNsense\CaptivePortal\CPClient();
if ($cpc->isEnabled()) {
// load modules ( only if CP is enabled )
captiveportal_load_modules();
}
$cpc->reconfigure();
unset($cpc);
// }
}
@ -395,8 +394,9 @@ function captiveportal_load_modules() {
/* Always load dummynet now that even allowed ip and mac passthrough use it. */
if (!is_module_loaded("dummynet.ko")) {
mwexec("/sbin/kldload dummynet");
set_sysctl(array("net.inet.ip.dummynet.io_fast" => "1", "net.inet.ip.dummynet.hash_size" => "256"));
// TODO : enable dummynet when kernel issues are solved, dummynet currently disabled in the gui
//mwexec("/sbin/kldload dummynet");
//set_sysctl(array("net.inet.ip.dummynet.io_fast" => "1", "net.inet.ip.dummynet.hash_size" => "256"));
}
unmute_kernel_msgs();
}