diff options
author | Ermal Luçi <eri@pfsense.org> | 2008-02-21 18:22:00 +0000 |
---|---|---|
committer | Ermal Luçi <eri@pfsense.org> | 2008-02-21 18:22:00 +0000 |
commit | fce824608bfde0b239e141bb387f98f461c433f4 (patch) | |
tree | 5763ac6a312974ea07b784a2f0e2f2a958f65895 /etc/inc | |
parent | 925e23bf574b6ae836d8bfb94c49a05b6d9b498e (diff) | |
download | pfsense-fce824608bfde0b239e141bb387f98f461c433f4.zip pfsense-fce824608bfde0b239e141bb387f98f461c433f4.tar.gz |
* Fix some bugs when deleteing queues
* Remove Manuel from firewall_shaper.php copyright this has nothing to do with him
* Apply fixes to show the actions taken on queues directly(you needed a refresh to display those), though we pay some penalty for this now
Diffstat (limited to 'etc/inc')
-rw-r--r-- | etc/inc/shaper.inc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index bf53963..7c9904a 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -437,10 +437,10 @@ class altq_root_queue { } function delete_queue() { - foreach ($this->queues as $q) - $q->delete_queue(); - + foreach ($this->queues as $q) { $this->SetAvailableBandwidth($this->GetAvailableBandwidth() + $q->GetAvailableBandwidth()); + $q->delete_queue(); + } unset_object_by_reference($this->GetLink()); } @@ -1239,10 +1239,10 @@ class hfsc_queue extends priq_queue { altq_set_default_queue($this->GetInterface(), "false"); cleanup_queue_from_rules($this->GetQname()); $parent =& $this->GetParent(); - foreach ($this->subqueues as $q) - $q->delete_queue(); + foreach ($this->subqueues as $q) { $this->SetAvailableBandwidth($this->GetAvailableBandwidth() + $q->GetAvailableBandwidth()); - + $q->delete_queue(); + } unset_object_by_reference($this->GetLink()); } @@ -1786,11 +1786,11 @@ class cbq_queue extends priq_queue { if ($this->GetDefault()) altq_set_default_queue($this->GetInterface(), "false"); cleanup_queue_from_rules($this->GetQname()); - foreach ($this->subqueues as $q) - $q->delete_queue(); + foreach ($this->subqueues as $q) { $this->SetAvailableBandwidth($this->GetAvailableBandwidth() + $q->GetAvailableBandwidth()); - $parent =& $this->GetParent(); - unset_object_by_reference($this->subqueues[$qname]->GetLink()); + $q->delete_queue(); + } + unset_object_by_reference($this->GetLink()); } function validate_input($data, &$input_errors) { |