Add incoming traffic limiting to Qos

This adds support for Qos using incoming policing. It is accepts the
syntax and processes commands, but is not fully debugged.

Bugfix: 3664

1 files changed, 4 insertions, 6 deletions

diff --git a/scripts/VyattaQosMatch.pm b/scripts/VyattaQosMatch.pm
index 0fedda2..9c9945d 100644
--- a/scripts/VyattaQosMatch.pm
+++ b/scripts/VyattaQosMatch.pm
@@ -56,7 +56,7 @@ sub _define {
 }
 
 sub filter {
-    my ( $self, $out, $dev, $parent, $id, $dsmark ) = @_;
+    my ( $self, $out, $dev, $parent, $prio, $dsmark ) = @_;
     my $ip = $self->{_ip};
     my $indev = $self->{_dev};
     my $vif = $self->{_vif};
@@ -69,14 +69,13 @@ sub filter {
     # Special case for when dsmarking is used with ds matching
     # original dscp is saved in tc_index
     if (defined $dsmark && defined $ip && defined $$ip{dsfield}) {
-	printf {$out} "filter add dev %s parent %x:0 protocol ip prio 1",
+	printf {$out} "filter add dev %s parent %x: protocol ip prio 1",
 		$dev, $parent;
-	printf ${out} " handle %d tcindex classid %x:%x\n",
-		$$ip{dsfield}, $parent, $id;
+	printf ${out} " handle %d tcindex", $$ip{dsfield};
 	return;
     }
 
-    printf {$out} "filter add dev %s parent %x:0 prio 1", $dev, $parent;
+    printf {$out} "filter add dev %s parent %x: prio %d", $dev, $parent, $prio;
     if (defined $ip) {
 	print {$out} " protocol ip u32";
 	print {$out} " match ip dsfield $$ip{dsfield} 0xff"
@@ -98,5 +97,4 @@ sub filter {
 	print {$out} " match meta\(vlan mask 0xfff eq $vif\)"
 	    if (defined $vif);
     }
-    printf {$out} " classid %x:%x\n", $parent, $id;
 }