load ipfw when either CP or the trafficshaper is enabled, final take on

#2569
opnsense · Aug 14, 2018 · 82d207f · 82d207f
1 parent 32aa199
commit 82d207f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
@@ -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";
     }

diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.php b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/TrafficShaper.php
@@ -139,4 +139,17 @@ public function getMaxRuleSequence()
 
         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;
+    }
 }