From 5bf71c91933ee022e3fd451d1625aba0e3953499 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Mon, 8 Dec 2008 12:01:23 -0800
Subject: Ignore description in match specification

Bugfix 3976
Need to ignore description when checking
---
 lib/Vyatta/Qos/TrafficLimiter.pm | 4 ++--
 lib/Vyatta/Qos/TrafficShaper.pm  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/Vyatta/Qos/TrafficLimiter.pm b/lib/Vyatta/Qos/TrafficLimiter.pm
index e897c03..5c6abba 100644
--- a/lib/Vyatta/Qos/TrafficLimiter.pm
+++ b/lib/Vyatta/Qos/TrafficLimiter.pm
@@ -108,8 +108,8 @@ sub _define {
     my %matchTypes = ();
     foreach my $class ( $config->listNodes("class") ) {
         foreach my $match ( $config->listNodes("class $class match") ) {
-            foreach my $type ( $config->listNodes("class $class match $match") )
-            {
+            foreach my $type ( $config->listNodes("class $class match $match") ) {
+		next if ($type eq 'description');
                 $matchTypes{$type} = "$class match $match";
             }
         }
diff --git a/lib/Vyatta/Qos/TrafficShaper.pm b/lib/Vyatta/Qos/TrafficShaper.pm
index 18f4898..ca0baa7 100644
--- a/lib/Vyatta/Qos/TrafficShaper.pm
+++ b/lib/Vyatta/Qos/TrafficShaper.pm
@@ -311,6 +311,7 @@ sub _define {
     foreach my $class ( $config->listNodes("class")) {
 	foreach my $match ( $config->listNodes("class $class match") ) {
 	    foreach my $type ( $config->listNodes("class $class match $match") ) {
+		next if ($type eq 'description');
 		$matchTypes{$type} = "$class match $match";
 	    }
 	}
-- 
cgit v1.2.3