summaryrefslogtreecommitdiffstats
path: root/etc/inc/shaper.inc
diff options
context:
space:
mode:
authorMichele Di Maria <michele@nt2.it>2011-12-06 22:51:11 +0100
committerMichele Di Maria <michele@nt2.it>2011-12-06 22:51:11 +0100
commitd34ade523b8d9cd959cbbc8a5e60a163dd8618ff (patch)
tree82af9f847c2fcbfb4f1a5c9ac45c225377908239 /etc/inc/shaper.inc
parent0a0292326f564ac143a1fab06cc9eeedf16004e0 (diff)
downloadpfsense-d34ade523b8d9cd959cbbc8a5e60a163dd8618ff.zip
pfsense-d34ade523b8d9cd959cbbc8a5e60a163dd8618ff.tar.gz
Fixes this: http://redmine.pfsense.org/issues/2015
I was checking, but if someone of the stuff give it a check it would be much better, since this is a core feature!
Diffstat (limited to 'etc/inc/shaper.inc')
-rw-r--r--etc/inc/shaper.inc8
1 files changed, 5 insertions, 3 deletions
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc
index 74e548b..25c72b7 100644
--- a/etc/inc/shaper.inc
+++ b/etc/inc/shaper.inc
@@ -1191,12 +1191,13 @@ class priq_queue {
function build_shortform() {
/* XXX: Hacks in site. Mostly layer violations! */
global $g, $altq_list_queues;
-
+ global $shaperIFlist;
+
$altq =& $altq_list_queues[$this->GetInterface()];
if ($altq)
$scheduler = ": " . $altq->GetScheduler();
$form = "<tr><td width=\"20%\" class=\"vtable\">";
- $form .= "<a href=\"firewall_shaper.php?interface=" . $this->GetInterface() . "&queue=" . $this->GetInterface()."&action=show\">". $shaperIFlist[$this->GetInterface()] .": ".$scheduler."</a>";
+ $form .= "<a href=\"firewall_shaper.php?interface=" . $this->GetInterface() . "&queue=" . $this->GetQname()."&action=show\">". $shaperIFlist[$this->GetInterface()] .$scheduler."</a>";
$form .= "</td></tr>";
/*
* XXX: Hack in sight maybe fix with a class that wraps all
@@ -4036,12 +4037,13 @@ function filter_generate_dummynet_rules() {
function build_iface_without_this_queue($iface, $qname) {
global $g, $altq_list_queues;
+ global $shaperIFlist;
$altq =& $altq_list_queues[$iface];
if ($altq)
$scheduler = ": " . $altq->GetScheduler();
$form = "<tr><td width=\"20%\" >";
- $form .= "<a href=\"firewall_shaper.php?interface=" . $iface . "&queue=" . $iface."&action=show\">".$iface.": ".$scheduler."</a>";
+ $form .= "<a href=\"firewall_shaper.php?interface=" . $iface . "&queue=" . $iface."&action=show\">". $shaperIFlist[$iface] . $scheduler."</a>";
$form .= "</td></tr>";
$form .= "<tr><td width=\"100%\" class=\"vncellreq\">";
$form .= "<a href=\"firewall_shaper_queues.php?interface=";
OpenPOWER on IntegriCloud