mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change a few more instances of using the physical interface to the friendly interface in status_queues.php, which allows root queues to function with the new VLAN interface names. Fixes #8007

Browse Source
This commit is contained in:
jim-p 2017-10-30 15:34:44 -04:00
parent c3938c16e3
commit 2d07b58d8c
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/usr/local/www/status_queues.php
View File

@ -225,17 +225,19 @@ function processQueues($altqstats, $level, $parent_name) {
$prev_if = $q['interface'];
}
$qfinterface = convert_real_interface_to_friendly_interface_name($q['interface']);
$qname = str_replace($q['interface'], $qfinterface, $q['name']);
?>
<tr class="<?=$parent_name;?>">
<td class="<?=$row_class?>" style="padding-left:<?=$level * 20?>px;">
<?php
if (is_array($q['queue'])) {
echo "<a href=\"#\" onclick=\"StatsShowHide('queuerow{$q['name']}{$qfinterface}');return false\">+/-</a>";
echo "<a href=\"#\" onclick=\"StatsShowHide('queuerow{$qname}{$qfinterface}');return false\">+/-</a>";
}
if (strstr($q['name'], "root_")) {
if (strstr($qname, "root_")) {
echo "<a href=\"firewall_shaper.php?interface={$if_name}&amp;queue={$if_name}&amp;action=show\">Root queue</a>";
} else {
echo "<a href=\"firewall_shaper.php?interface={$if_name}&amp;queue={$q['name']}&amp;action=show\">" . htmlspecialchars($q['name']) . "</a>";
echo "<a href=\"firewall_shaper.php?interface={$if_name}&amp;queue={$qname}&amp;action=show\">" . htmlspecialchars($qname) . "</a>";
}
?>
</td>
@ -243,15 +245,15 @@ function processQueues($altqstats, $level, $parent_name) {
$cpuUsage = 0;
print('<td>');
print('<div class="progress" style="height: 7px;width: 170px;">');
print(' <div class="progress-bar" role="progressbar" id="queue' . $q['name'] . $qfinterface . 'width" aria-valuenow="70" aria-valuemin="0" aria-valuemax="100" style="width: ' . $cpuUsage*100 . '%;"></div>');
print(' <div class="progress-bar" role="progressbar" id="queue' . $qname . $qfinterface . 'width" aria-valuenow="70" aria-valuemin="0" aria-valuemax="100" style="width: ' . $cpuUsage*100 . '%;"></div>');
print(' </div>');
print('</td>');
print('<td><input readonly style="border:0;width:70px;text-align:right;" name="queue' . $q['name'] . $qfinterface . 'pps" id="queue' . $q['name'] . $qfinterface . 'pps" value="(' . gettext("Loading") . ')" /></td>');
print('<td><input readonly style="border:0;width:80px;text-align:right;" name="queue' . $q['name'] . $qfinterface . 'bps" id="queue' . $q['name'] . $qfinterface . 'bps" value="" /></td>');
print('<td><input readonly style="border:0;width:70px;text-align:right;" name="queue' . $q['name'] . $qfinterface . 'borrows" id="queue' . $q['name'] . $qfinterface . 'borrows" value="" /></td>');
print('<td><input readonly style="border:0;width:70px;text-align:right;" name="queue' . $q['name'] . $qfinterface . 'suspends" id="queue' . $q['name'] . $qfinterface . 'suspends" value="" /></td>');
print('<td><input readonly style="border:0;width:70px;text-align:right;" name="queue' . $q['name'] . $qfinterface . 'drops" id="queue' . $q['name'] . $qfinterface . 'drops" value="" /></td>');
print('<td><input readonly style="border:0;width:70px;text-align:right;" name="queue' . $q['name'] . $qfinterface . 'length" id="queue' . $q['name'] . $qfinterface . 'length" value="" /></td>');
print('<td><input readonly style="border:0;width:70px;text-align:right;" name="queue' . $qname . $qfinterface . 'pps" id="queue' . $qname . $qfinterface . 'pps" value="(' . gettext("Loading") . ')" /></td>');
print('<td><input readonly style="border:0;width:80px;text-align:right;" name="queue' . $qname . $qfinterface . 'bps" id="queue' . $qname . $qfinterface . 'bps" value="" /></td>');
print('<td><input readonly style="border:0;width:70px;text-align:right;" name="queue' . $qname . $qfinterface . 'borrows" id="queue' . $qname . $qfinterface . 'borrows" value="" /></td>');
print('<td><input readonly style="border:0;width:70px;text-align:right;" name="queue' . $qname . $qfinterface . 'suspends" id="queue' . $qname . $qfinterface . 'suspends" value="" /></td>');
print('<td><input readonly style="border:0;width:70px;text-align:right;" name="queue' . $qname . $qfinterface . 'drops" id="queue' . $qname . $qfinterface . 'drops" value="" /></td>');
print('<td><input readonly style="border:0;width:70px;text-align:right;" name="queue' . $qname . $qfinterface . 'length" id="queue' . $qname . $qfinterface . 'length" value="" /></td>');
?>
</tr>
<?php
@ -264,9 +266,12 @@ function processQueues($altqstats, $level, $parent_name) {
function statsQueues($xml) {
global $statistics;
$fname = convert_real_interface_to_friendly_interface_name($xml['interface']);
$qname = str_replace($xml['interface'], $fname, $xml['name']);
$current = new QueueStats();
$child = new QueueStats();
$current->queuename = $xml['name'] . convert_real_interface_to_friendly_interface_name($xml['interface']);
$current->queuename = $qname . $fname;
$current->queuelength = $xml['qlength'];
$current->pps = $xml['measured'];
$current->bandwidth = $xml['measuredspeedint'];