diff options
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 3 | ||||
| -rwxr-xr-x | usr/local/www/status_queues.php | 13 |
2 files changed, 11 insertions, 5 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 8c65fa3..4af92fa 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -634,7 +634,6 @@ function gather_altq_queue_stats($dont_return_root_queues) { array_push($queue_stats, "{$queue_name}|{$speed}|{$measured}|{$borrows}|{$suspends}|{$drops}"); } } - $queue_stats = sort($queue_stats); return $queue_stats; } @@ -938,4 +937,4 @@ function fetch_latest_pkg_config() { return; } -?> +?>
\ No newline at end of file diff --git a/usr/local/www/status_queues.php b/usr/local/www/status_queues.php index 617ca04..1a3496a 100755 --- a/usr/local/www/status_queues.php +++ b/usr/local/www/status_queues.php @@ -38,9 +38,16 @@ if($_GET['reset'] <> "") { if (!is_array($config['shaper']['queue'])) { $config['shaper']['queue'] = array(); } -$a_queues = &$config['shaper']['queue']; -$a_queues = sort($a_queues); +$a_queues = array(); + +$pfctl_vsq = `/sbin/pfctl -vsq`; +$pfctl_vsq_array = split("\n", $pfctl_vsq); +foreach($pfctl_vsq_array as $pfctl) { + if (preg_match_all("/queue\s+(\w+)\s+/",$pfctl,$match_array)) + if(stristr($match_array[1][0],"root_")==false) + $a_queues[] = $match_array[1][0]; +} ?> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> @@ -62,7 +69,7 @@ $a_queues = sort($a_queues); <?php $i = 0; foreach ($a_queues as $queue): ?> <tr valign="top"> <td class="listbg"> - <font color="#FFFFFF"><?=htmlspecialchars($queue['name']);?> + <font color="#FFFFFF"><?=htmlspecialchars($queue);?> <br> <?php $cpuUsage = 0; |
