summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-06-11 14:52:00 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-06-11 14:52:00 -0700
commit91f22d461e52fa326c155b14c5806b340140e3b2 (patch)
tree60a1318fdcefcedf81d6d6019e10b921020361bd
parent671a8b2b64c93bc8bd0a5165d03017f968852e38 (diff)
downloadvyatta-op-qos-91f22d461e52fa326c155b14c5806b340140e3b2.tar.gz
vyatta-op-qos-91f22d461e52fa326c155b14c5806b340140e3b2.zip
Change column headings
Input policy is called Action (limter, redirect,...) and Output policy is called Policy.
-rw-r--r--scripts/show-input-policy.pl2
-rwxr-xr-xscripts/vyatta-show-queueing.pl5
2 files changed, 4 insertions, 3 deletions
diff --git a/scripts/show-input-policy.pl b/scripts/show-input-policy.pl
index 98ef37f..2c139e7 100644
--- a/scripts/show-input-policy.pl
+++ b/scripts/show-input-policy.pl
@@ -134,7 +134,7 @@ sub show_brief {
my @interfaces = ingress_interface();
my $fmt = "%-10s %-10s %-10s %-9s %-9s\n";
- printf $fmt, 'Interface', 'Policy', 'Received', 'Dropped', 'Overlimit';
+ printf $fmt, 'Interface', 'Action', 'Received', 'Dropped', 'Overlimit';
foreach my $intf (sort @interfaces) {
my $filters = get_filter($intf);
diff --git a/scripts/vyatta-show-queueing.pl b/scripts/vyatta-show-queueing.pl
index 03e3aae..5ab66c0 100755
--- a/scripts/vyatta-show-queueing.pl
+++ b/scripts/vyatta-show-queueing.pl
@@ -39,13 +39,14 @@ my %qdisc_types = (
'pfifo_fast' => 'default',
'sfq' => 'fair-queue',
'tbf' => 'rate-control',
- 'htb' => 'traffic-shaper',
+ 'htb' => 'shaper',
'pfifo' => 'drop-tail',
'red' => 'random-detect',
'drr' => 'round-robin',
'prio' => 'priority-queue',
'netem' => 'network-emulator',
'gred' => 'weighted-random',
+ 'prio' => 'limiter', # XXX may be more in future
);
# Convert from kernel to vyatta nams
@@ -58,7 +59,7 @@ sub shaper {
sub show_brief {
my $fmt = "%-10s %-16s %10s %10s %10s\n";
- printf $fmt, 'Interface', 'Qos-Policy', 'Sent', 'Dropped', 'Overlimit';
+ printf $fmt, 'Interface', 'Policy', 'Sent', 'Dropped', 'Overlimit';
# Read qdisc info
open( my $tc, '-|', '/sbin/tc -s qdisc ls' )