detect match conflicts during commit

Matching on 'ip' uses the u32 tc filter and other match types 'interface',
'vif' use the basic tc filter. Since kernel doesn't allow mixing filter
types in the same classifier, need to catch and report the problem rather
than failing in the actual commands.

1 files changed, 20 insertions, 0 deletions

diff --git a/scripts/VyattaQosTrafficShaper.pm b/scripts/VyattaQosTrafficShaper.pm
index 361a2dd..854ee41 100644
--- a/scripts/VyattaQosTrafficShaper.pm
+++ b/scripts/VyattaQosTrafficShaper.pm
@@ -173,6 +173,26 @@ sub _define {
 
     $config->exists("default")
 	or die "Configuration not complete: missing default class\n";
+
+    # make sure no clash of different types of tc filters
+    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") ) {
+		$matchTypes{$type} = "$class match $match";
+	    }
+	}
+    }
+
+    if (scalar keys %matchTypes > 1 && $matchTypes{ip}) {
+	print "Match type conflict:\n";
+	while (my ($type, $usage) = each(%matchTypes)) {
+	    print "   class $usage $type\n";
+	}
+	die "Can't match on both ip and other types\n";
+    }
+
+
     $config->setLevel("$level default");
     push @classes, new ShaperClass($config, -1);
     $config->setLevel($level);