MFC 11604

Don't create a pass out rule for a queue if it is not on an interface or not used in a rule. This will cut queue pass out rules by the number of interfaces enabled.

1 files changed, 5 insertions, 3 deletions

diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc
index 54f9599..37e85dd 100644
--- a/etc/inc/shaper.inc
+++ b/etc/inc/shaper.inc
@@ -180,13 +180,15 @@ function is_subqueue_used_on_interface($queuename, $interface) {
 	return 0;
 }
 
-function filter_is_queue_being_used_on_interface($queuename, $interface) {
+function filter_is_queue_being_used_on_interface($queuename, $interface, $direction = 'in') {
 	global $config;
 	$lconfig = $config;
 
 	if(!is_array($lconfig['shaper']['rule'])) return null;
 	foreach($lconfig['shaper']['rule'] as $rule) {
-		if(($rule['inqueue'] == $queuename && $rule['in-interface'] == $interface))
+		$q  = $direction . 'queue';
+		$if = $direction . '-interface';
+		if(($rule[$q] == $queuename && $rule[$if] == $interface))
 		return $interface;
 	}
 	return null;
@@ -660,4 +662,4 @@ function filter_generate_pf_altq_rules() {
 	return $shaperrules;
 }
 
-?>
\ No newline at end of file
+?>