Merge branch 'larkspur' of vm:git/vyatta-cfg-qos into larkspur

3 files changed, 20 insertions, 116 deletions

diff --git a/lib/Vyatta/Qos/IngressMirror.pm b/lib/Vyatta/Qos/IngressMirror.pm
deleted file mode 100644
index d3e52c0..0000000
--- a/lib/Vyatta/Qos/IngressMirror.pm
+++ /dev/null
@@ -1,56 +0,0 @@
-# Ingress Mirror
-#   Duplicate all packets to another interface
-#   This is useful for some forms of IDS or capture
-#
-# **** License ****
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# This code was originally developed by Vyatta, Inc.
-# Portions created by Vyatta are Copyright (C) 2010 Vyatta, Inc.
-# All Rights Reserved.
-# **** End License ****
-
-package Vyatta::Qos::IngressMirror;
-use strict;
-use warnings;
-
-require Vyatta::Config;
-
-sub new {
-    my ( $that, $config, $name ) = @_;
-    my $self = {};
-    my $class = ref($that) || $that;
-
-    bless $self, $class;
-    $self->_define($config);
-
-    return $self;
-}
-
-# Setup new instance.
-sub _define {
-    my ( $self, $config ) = @_;
-    # config is at level: interfaces ethernet $dev input-policy redirect
-    $self->{_target} = $config->returnValue();
-}
-
-sub commands {
-    my ( $self, $dev, $parent ) = @_;
-    my $target = $self->{_target};
-
-    # Apply filter to ingress qdisc
-    # NB: action is egress because we are in ingress (upside down)
-    printf "filter add dev %s parent %x: ", $dev, $parent;
-    print  " protocol all prio 10 u32"; 
-    print  " match u32 0 0 flowid 1:1";
-    print  " action mirred egress mirror dev $target\n";
-}
-
-1;
diff --git a/lib/Vyatta/Qos/IngressRedirect.pm b/lib/Vyatta/Qos/IngressRedirect.pm
deleted file mode 100644
index 2bffd30..0000000
--- a/lib/Vyatta/Qos/IngressRedirect.pm
+++ /dev/null
@@ -1,55 +0,0 @@
-# Ingress Redirect
-#   Forward all packets to another interface
-#
-# **** License ****
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# This code was originally developed by Vyatta, Inc.
-# Portions created by Vyatta are Copyright (C) 2010 Vyatta, Inc.
-# All Rights Reserved.
-# **** End License ****
-
-package Vyatta::Qos::IngressRedirect;
-use strict;
-use warnings;
-
-require Vyatta::Config;
-
-sub new {
-    my ( $that, $config, $name ) = @_;
-    my $self = {};
-    my $class = ref($that) || $that;
-
-    bless $self, $class;
-    $self->_define($config);
-
-    return $self;
-}
-
-# Setup new instance.
-sub _define {
-    my ( $self, $config, $dev ) = @_;
-    # config is at level: interfaces ethernet $dev input-policy redirect
-    $self->{_target} = $config->returnValue();
-}
-
-sub commands {
-    my ( $self, $dev, $parent ) = @_;
-    my $target = $self->{_target};
-
-    # Apply filter to ingress qdisc
-    # NB: action is egress because we are in ingress (upside down)
-    printf "filter add dev %s parent %x: ", $dev, $parent;
-    print  " protocol all prio 10 u32"; 
-    print  " match u32 0 0 flowid 1:1";
-    print  " action mirred egress redirect dev $target\n";
-}
-
-1;
diff --git a/lib/Vyatta/Qos/IngressLimit.pm b/lib/Vyatta/Qos/TrafficLimiter.pm
index e9e2fbb..2d973c5 100644
--- a/lib/Vyatta/Qos/IngressLimit.pm
+++ b/lib/Vyatta/Qos/TrafficLimiter.pm
@@ -1,4 +1,5 @@
-# Ingress traffic limit
+# Traffic limiter
+# This is a rate limiter based on ingress qdisc
 #
 # **** License ****
 # This program is free software; you can redistribute it and/or modify
@@ -11,22 +12,26 @@
 # General Public License for more details.
 #
 # This code was originally developed by Vyatta, Inc.
-# Portions created by Vyatta are Copyright (C) 2010 Vyatta, Inc.
+# Portions created by Vyatta are Copyright (C) 2008 Vyatta, Inc.
 # All Rights Reserved.
 # **** End License ****
 
-package Vyatta::Qos::IngressLimit;
+package Vyatta::Qos::TrafficLimiter;
 use strict;
 use warnings;
 
 require Vyatta::Config;
 require Vyatta::Qos::LimiterClass;
 
+my %fields = (
+    _level   => undef,
+    _classes => undef,
+);
 
 # Create a new instance based on config information
 sub new {
     my ( $that, $config, $name ) = @_;
-    my $self = {};
+    my $self = {%fields};
     my $class = ref($that) || $that;
 
     bless $self, $class;
@@ -36,6 +41,7 @@ sub new {
 }
 
 # Setup new instance.
+# Assumes caller has done $config->setLevel to "traffic-limiter $name"
 sub _define {
     my ( $self, $config ) = @_;
     my $level   = $config->setLevel();
@@ -70,8 +76,17 @@ sub _define {
 }
 
 sub commands {
-    my ( $self, $dev, $parent ) = @_;
+    my ( $self, $dev, $direction ) = @_;
     my $classes = $self->{_classes};
+    my $parent;
+
+    if ($direction eq 'in') {
+	$parent  = 0xffff;
+	printf "qdisc add dev %s handle %x: ingress\n", $dev, $parent;
+    } else {
+	$parent = 1;
+	printf "qdisc add dev %s handle $x: prio\n", $dev, $parent;
+    }
 
     foreach my $class (@$classes) {
         foreach my $match ( $class->matchRules() ) {