Fix mixing of set-dscp and dscp match

Use tcindex to get original dsfield value.

Fixes bug: 3033

1 files changed, 5 insertions, 8 deletions

diff --git a/scripts/VyattaQosTrafficShaper.pm b/scripts/VyattaQosTrafficShaper.pm
index 02bfd31..8e7c1e3 100644
--- a/scripts/VyattaQosTrafficShaper.pm
+++ b/scripts/VyattaQosTrafficShaper.pm
@@ -350,15 +350,12 @@ sub commands {
 	}
 
 	print {$out} "qdisc add dev $dev handle 1:0 root dsmark"
-	    . " indices $indices default_index $default->{id}\n";
+	    . " indices $indices default_index $default->{id} set_tc_index\n";
 
 	foreach my $class (@$classes) {
 	    $class->dsmarkClass($out, 1, $dev);
-	   
-	    if ($class->{dsmark}) {
-		foreach my $match ($class->matchRules()) {
-		    $match->filter($out, $dev, 1, $class->{id});
-		}
+	    foreach my $match ($class->matchRules()) {
+		$match->filter($out, $dev, 1, $class->{id});
 	    }
 	}
 
@@ -375,8 +372,8 @@ sub commands {
         $class->htbClass($out, $dev, $parent, $rate);
 
 	foreach my $match ($class->matchRules()) {
-	    $match->filter($out, $dev, 1, $class->{id});
-        }
+	    $match->filter($out, $dev, $parent, $class->{id}, $class->{dsmark});
+	}
     }
 }