From 194f211880c0c8e0537ab9ab5c606d2769dc92c5 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Sun, 8 Mar 2009 16:34:30 -0700
Subject: Use hash rather than if/else for delete_interface

---
 scripts/vyatta-qos.pl | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'scripts')

diff --git a/scripts/vyatta-qos.pl b/scripts/vyatta-qos.pl
index 4245e5e..8b8b978 100755
--- a/scripts/vyatta-qos.pl
+++ b/scripts/vyatta-qos.pl
@@ -104,24 +104,23 @@ sub list_policy {
     }
 }
 
+my %delcmd = (
+    'out' => 'root',
+    'in'  => 'parent ffff:',
+);
+
 ## delete_interface('eth0', 'out')
 # remove all filters and qdisc's
 sub delete_interface {
     my ( $interface, $direction ) = @_;
+    my $arg = $delcmd{$direction};
 
-    for ($direction) {
+    die "bad direction $direction\n" unless $arg;
+    
+    my $cmd = "sudo tc qdisc del dev $interface ". $arg . " 2>/dev/null";
 
-        # delete old qdisc - silence error if no qdisc loaded
-        if (/^out$/) {
-            qx(sudo /sbin/tc qdisc del dev "$interface" root 2>/dev/null);
-        }
-        elsif (/^in$/) {
-qx(sudo /sbin/tc qdisc del dev "$interface" parent ffff: 2>/dev/null);
-        }
-        else {
-            croak "bad direction $direction";
-        }
-    }
+    # ignore errors (may have no qdisc)
+    system($cmd);
 }
 
 ## start_interface('ppp0')
-- 
cgit v1.2.3