diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-11-03 12:53:40 -0200 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-11-03 12:53:40 -0200 |
commit | 4816e5caa29b542c57659de8eff53ba51e355b24 (patch) | |
tree | 7482c94367d6a7929f9e249dd71d4da5b8906953 /etc/inc/shaper.inc | |
parent | f5fe66cd96ed7903244b83564d4a74f16ca6369f (diff) | |
parent | b039f099e66c9dbd0c33470bc4613e0cfdc9a1a0 (diff) | |
download | pfsense-4816e5caa29b542c57659de8eff53ba51e355b24.zip pfsense-4816e5caa29b542c57659de8eff53ba51e355b24.tar.gz |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/auth.inc
etc/inc/config.lib.inc
etc/inc/priv.defs.inc
etc/inc/system.inc
etc/inc/upgrade_config.inc
etc/inc/vpn.inc
Diffstat (limited to 'etc/inc/shaper.inc')
-rw-r--r-- | etc/inc/shaper.inc | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index 06cc4ba..8c1610a 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -902,6 +902,7 @@ class priq_queue { } function &get_queue_list(&$qlist) { + $qlist[$this->GetQname()] = & $this; if (is_array($this->subqueues)) { foreach ($this->subqueues as $queue) @@ -3125,6 +3126,8 @@ class dnqueue_class extends dummynet_class { } function &get_queue_list(&$qlist) { + if ($this->GetEnabled() == "") + return; $qlist[$this->GetQname()] = "?" .$this->GetNumber(); } @@ -3779,9 +3782,13 @@ function &get_unique_queue_list() { $qlist = array(); if (is_array($altq_list_queues)) { foreach ($altq_list_queues as $altq) { + if ($altq->GetEnabled()) + continue; $tmplist =& $altq->get_queue_list(); - foreach ($tmplist as $qname => $link) - $qlist[$qname] = $link; + foreach ($tmplist as $qname => $link) { + if ($link->GetEnabled() <> "") + $qlist[$qname] = $link; + } } } return $qlist; @@ -3793,9 +3800,12 @@ function &get_unique_dnqueue_list() { $qlist = array(); if (is_array($dummynet_pipe_list)) { foreach ($dummynet_pipe_list as $dn) { + if ($dn->GetEnabled() == "") + continue; $tmplist =& $dn->get_queue_list(); - foreach ($tmplist as $qname => $link) + foreach ($tmplist as $qname => $link) { $qlist[$qname] = $link; + } } } return $qlist; @@ -3832,11 +3842,11 @@ function read_altq_config() { return; foreach ($a_int as $key => $conf) { - $int = $conf['interface']; - $root =& new altq_root_queue(); - $root->SetInterface($int); - $altq_list_queues[$root->GetInterface()] = &$root; - $root->ReadConfig($conf); + $int = $conf['interface']; + $root =& new altq_root_queue(); + $root->SetInterface($int); + $altq_list_queues[$root->GetInterface()] = &$root; + $root->ReadConfig($conf); array_push($path, $key); $root->SetLink($path); if (is_array($conf['queue'])) { @@ -3849,7 +3859,7 @@ function read_altq_config() { $root->add_queue($root->GetInterface(), $q, &$path, $input_errors); array_pop($path); } - } + } array_pop($path); } } |