lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-18 02:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "load ipfw when either CP or the trafficshaper is enabled, final take on https://github.com/opnsense/core/issues/2569""

Browse Source 
This reverts commit 6152f14b6b2c6662cc4a0d18258eb30e5a5141f6.
This commit is contained in:
Ad Schellevis 2018-08-15 20:27:45 +02:00
parent d1fc5afc2b
commit fb072dbd6b
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/etc/inc/system.inc
View File

@ -1068,7 +1068,7 @@ function system_kernel_configure($verbose = false)
$mods[] = $config['system']['thermal_hardware'];
}
if (!empty($config['OPNsense']['TrafficShaper']['rules']['rule'])) {
if ((new \OPNsense\TrafficShaper\TrafficShaper())->isEnabled() || (new \OPNsense\CaptivePortal())->isEnabled()) {
$mods[] = "ipfw";
$mods[] = "dummynet";
}

13
src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.php
View File

@ -139,4 +139,17 @@ class TrafficShaper extends BaseModel
return $seq;
}
/**
* retrieve last generated rule sequence number
*/
public function isEnabled()
{
foreach ($this->pipes->pipe->__items as $item) {
if ((string)$item->enabled == "1") {
return true;
}
}
return false;
}
}