diff options
| author | Bill Marquette <billm@pfsense.org> | 2005-06-04 02:43:41 +0000 |
|---|---|---|
| committer | Bill Marquette <billm@pfsense.org> | 2005-06-04 02:43:41 +0000 |
| commit | f1f924bf245e3263b0ead916cb987f69d4cda7ba (patch) | |
| tree | a0809167afbcc1e32cb3f9072332594fd29e5bc4 /etc/inc | |
| parent | 1d1038ee5dcbc31c4517f5b175e6296fda222eae (diff) | |
| download | pfsense-f1f924bf245e3263b0ead916cb987f69d4cda7ba.zip pfsense-f1f924bf245e3263b0ead916cb987f69d4cda7ba.tar.gz | |
Commit more work on the magic shaper and shaper system
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/filter.inc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index e2b2c93..4342abc 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -254,7 +254,8 @@ function filter_is_queue_being_used_on_interface($queuename, $interface) { if(!is_array($lconfig['shaper']['rule'])) return; foreach($lconfig['shaper']['rule'] as $rule) { - if($rule['targetqueue'] == $queuename && $rule['interface'] == $interface) + if(($rule['inqueue'] == $queuename && $rule['interface'] == $interface) || + ($rule['outqueue'] == $queuename && $rule['interface'] == $interface)) return $interface; } return; @@ -330,7 +331,7 @@ function queue_interface_recursive($queuename) { if($status <> "") return $status; } foreach($config['shaper']['rule'] as $rule) { - if($rule['targetqueue'] == $queuename) + if($rule['inqueue'] == $queuename || $rule['outqueue'] == $queuename) return $rule['interface']; } } @@ -425,6 +426,7 @@ function generate_optcfg_array(& $optcfg) { } } +/* XXX - billm - need to do the outqueue portion too */ function filter_generate_pf_altq_rules() { /* I don't think we're in IPFW anymore Toto */ @@ -663,7 +665,7 @@ function filter_generate_pf_altq_rules() { $line .= "out xmit "; */ - $line .= " keep state tag {$rule['targetqueue']} "; + $line .= " keep state tag {$rule['inqueue']} "; $line .= "\n"; $shaperrules .= $line; |
