diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-17 16:01:30 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-17 16:01:30 -0800 |
| commit | b921fadb8462f936f14b23d7c8d8653cd14044f0 (patch) | |
| tree | 1db6d3d167df3c2a09184cdf665e28ea119750df | |
| parent | 58b9a977e6ce932706fae5e3eba6d40dd87b988b (diff) | |
| download | vyatta-cfg-qos-b921fadb8462f936f14b23d7c8d8653cd14044f0.tar.gz vyatta-cfg-qos-b921fadb8462f936f14b23d7c8d8653cd14044f0.zip | |
Ignore description in match specification
Bugfix 3976
Need to ignore description when checking
(Backport from jenner)
| -rw-r--r-- | scripts/VyattaQosTrafficLimiter.pm | 4 | ||||
| -rw-r--r-- | scripts/VyattaQosTrafficShaper.pm | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/VyattaQosTrafficLimiter.pm b/scripts/VyattaQosTrafficLimiter.pm index 649fb17..86d8a98 100644 --- a/scripts/VyattaQosTrafficLimiter.pm +++ b/scripts/VyattaQosTrafficLimiter.pm @@ -107,8 +107,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/scripts/VyattaQosTrafficShaper.pm b/scripts/VyattaQosTrafficShaper.pm index 5f9fe75..381bf23 100644 --- a/scripts/VyattaQosTrafficShaper.pm +++ b/scripts/VyattaQosTrafficShaper.pm @@ -310,6 +310,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"; } } |