summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/Vyatta/Qos/Match.pm10
-rw-r--r--lib/Vyatta/Qos/Priority.pm131
-rw-r--r--lib/Vyatta/Qos/RoundRobin.pm135
-rw-r--r--lib/Vyatta/Qos/ShaperClass.pm36
-rw-r--r--lib/Vyatta/Qos/TrafficShaper.pm91
5 files changed, 322 insertions, 81 deletions
diff --git a/lib/Vyatta/Qos/Match.pm b/lib/Vyatta/Qos/Match.pm
index 0c45958..765bcb8 100644
--- a/lib/Vyatta/Qos/Match.pm
+++ b/lib/Vyatta/Qos/Match.pm
@@ -27,12 +27,13 @@ sub new {
bless $self, $class;
- $self->{_vif} = $config->returnValue("vif");
- $self->{_dev} = getIfIndex($config->returnValue("interface"));
-
foreach my $ip (qw(ip ipv6)) {
next unless $config->exists($ip);
+ foreach my $t (qw(vif dev)) {
+ die "can not match on $ip and $t\n" if $config->exists($t);
+ }
+
# TODO make this data driven?
my %fields;
$fields{dsfield} = getDsfield( $config->returnValue("$ip dscp"));
@@ -44,6 +45,9 @@ sub new {
$self->{$ip} = \%fields;
}
+ $self->{_vif} = $config->returnValue("vif");
+ $self->{_dev} = getIfIndex($config->returnValue("interface"));
+
return $self;
}
diff --git a/lib/Vyatta/Qos/Priority.pm b/lib/Vyatta/Qos/Priority.pm
new file mode 100644
index 0000000..f4f01da
--- /dev/null
+++ b/lib/Vyatta/Qos/Priority.pm
@@ -0,0 +1,131 @@
+# Strict Priority
+# This is a deficit round robin scheduler
+#
+# **** 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) 2008 Vyatta, Inc.
+# All Rights Reserved.
+# **** End License ****
+
+package Vyatta::Qos::Priority;
+use strict;
+use warnings;
+
+require Vyatta::Config;
+require Vyatta::Qos::ShaperClass;
+
+# Create a new instance based on config information
+sub new {
+ my ( $that, $config, $name ) = @_;
+
+ my @classes = _getClasses( $config->setLevel() );
+ my $self = {};
+ my $class = ref($that) || $that;
+ bless $self, $class;
+ $self->{_classes} = \@classes;
+
+ return $self;
+}
+
+sub _getClasses {
+ my $level = shift;
+ my @classes;
+ my $config = new Vyatta::Config;
+
+ $config->setLevel($level);
+ my $default;
+ if ( $config->exists("default") ) {
+ $config->setLevel("$level default");
+ $default = new Vyatta::Qos::ShaperClass($config);
+ $config->setLevel($level);
+ }
+ else {
+ $default = new Vyatta::Qos::ShaperClass;
+ }
+ push @classes, $default;
+ $default->{id} = 1;
+
+ foreach my $id ( $config->listNodes("class") ) {
+ $config->setLevel("$level class $id");
+ push @classes, new Vyatta::Qos::ShaperClass( $config, $id );
+ }
+
+ return @classes;
+}
+
+sub commands {
+ my ( $self, $dev ) = @_;
+ my $classes = $self->{_classes};
+ my $parent = 1;
+
+ printf "qdisc add dev %s s handle %x: prio limit %d\n",
+ $dev, 'root', $parent, $self->{_limit};
+
+ foreach my $class (@$classes) {
+ $class->gen_leaf( $dev, $parent );
+ foreach my $match ( $class->matchRules() ) {
+ $match->filter( $dev, $parent, 1 );
+ printf " parent %x:%x\n", $parent, $class->{id};
+ }
+ }
+}
+
+# Walk configuration tree and look for changed nodes
+# The configuration system should do this but doesn't do it right
+sub isChanged {
+ my ( $self, $name ) = @_;
+ my $config = new Vyatta::Config;
+
+ $config->setLevel("qos-policy priority-queue $name");
+
+ foreach my $attr (qw(queue-limit queue-type)) {
+ return "default $attr" if ( $config->isChanged("default $attr") );
+ }
+
+ my %classNodes = $config->listNodeStatus('class');
+ while ( my ( $class, $status ) = each %classNodes ) {
+ return "class $class" if ( $status ne 'static' );
+
+ foreach my $attr (qw(queue-limit queue-type)) {
+ return "class $class $attr"
+ if ( $config->isChanged("class $class $attr") );
+ }
+
+ my %matchNodes = $config->listNodeStatus("class $class match");
+ while ( my ( $match, $status ) = each %matchNodes ) {
+ my $level = "class $class match $match";
+ if ( $status ne 'static' ) {
+ return $level;
+ }
+
+ foreach my $parm (
+ (
+ 'vif',
+ 'interface',
+ 'ip protocol',
+ 'ip source address',
+ 'ip destination address',
+ 'ip source port',
+ 'ip destination port'
+ )
+ )
+ {
+ return "$level $parm"
+ if ( $config->isChanged("$level $parm") );
+ }
+ }
+ }
+
+ return; # false
+}
+
+1;
diff --git a/lib/Vyatta/Qos/RoundRobin.pm b/lib/Vyatta/Qos/RoundRobin.pm
new file mode 100644
index 0000000..b4174d1
--- /dev/null
+++ b/lib/Vyatta/Qos/RoundRobin.pm
@@ -0,0 +1,135 @@
+# Round Robin
+# This is a deficit round robin scheduler
+#
+# **** 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) 2008 Vyatta, Inc.
+# All Rights Reserved.
+# **** End License ****
+
+package Vyatta::Qos::RoundRobin;
+use strict;
+use warnings;
+
+require Vyatta::Config;
+require Vyatta::Qos::ShaperClass;
+
+# Create a new instance based on config information
+sub new {
+ my ( $that, $config, $name ) = @_;
+
+ my @classes = _getClasses( $config->setLevel() );
+ my $self = {};
+ my $class = ref($that) || $that;
+ bless $self, $class;
+ $self->{_classes} = \@classes;
+
+ return $self;
+}
+
+sub _getClasses {
+ my $level = shift;
+ my @classes;
+ my $config = new Vyatta::Config;
+
+ $config->setLevel($level);
+ my $default;
+ if ( $config->exists("default") ) {
+ $config->setLevel("$level default");
+ $default = new Vyatta::Qos::ShaperClass($config);
+ $config->setLevel($level);
+ }
+ else {
+ $default = new Vyatta::Qos::ShaperClass;
+ }
+ push @classes, $default;
+ $default->{id} = 1;
+
+ foreach my $id ( $config->listNodes("class") ) {
+ $config->setLevel("$level class $id");
+ push @classes, new Vyatta::Qos::ShaperClass( $config, $id );
+ }
+
+ return @classes;
+}
+
+sub commands {
+ my ( $self, $dev ) = @_;
+ my $classes = $self->{_classes};
+ my $parent = 1;
+
+ printf "qdisc add dev %s s handle %x: drr", $dev, 'root', $parent;
+ my $quantum = $self->{_quantum};
+ print " quantum $quantum" if ($quantum);
+ print "\n";
+
+ foreach my $class (@$classes) {
+ $class->gen_leaf( $dev, $parent );
+ foreach my $match ( $class->matchRules() ) {
+ $match->filter( $dev, $parent, 1 );
+ printf " classid %x:%x\n", $parent, $class->{id};
+ }
+ }
+}
+
+# Walk configuration tree and look for changed nodes
+# The configuration system should do this but doesn't do it right
+sub isChanged {
+ my ( $self, $name ) = @_;
+ my $config = new Vyatta::Config;
+
+ $config->setLevel("qos-policy round-robin $name");
+
+ return 'quantum' if ( $config->isChanged('quantum') );
+
+ foreach my $attr (qw(queue-limit queue-type)) {
+ return "default $attr" if ( $config->isChanged("default $attr") );
+ }
+
+ my %classNodes = $config->listNodeStatus('class');
+ while ( my ( $class, $status ) = each %classNodes ) {
+ return "class $class" if ( $status ne 'static' );
+
+ foreach my $attr (qw(queue-limit queue-type)) {
+ return "class $class $attr"
+ if ( $config->isChanged("class $class $attr") );
+ }
+
+ my %matchNodes = $config->listNodeStatus("class $class match");
+ while ( my ( $match, $status ) = each %matchNodes ) {
+ my $level = "class $class match $match";
+ if ( $status ne 'static' ) {
+ return $level;
+ }
+
+ foreach my $parm (
+ (
+ 'vif',
+ 'interface',
+ 'ip protocol',
+ 'ip source address',
+ 'ip destination address',
+ 'ip source port',
+ 'ip destination port'
+ )
+ )
+ {
+ return "$level $parm"
+ if ( $config->isChanged("$level $parm") );
+ }
+ }
+ }
+
+ return; # false
+}
+
+1;
diff --git a/lib/Vyatta/Qos/ShaperClass.pm b/lib/Vyatta/Qos/ShaperClass.pm
index 631fc75..9a0ba00 100644
--- a/lib/Vyatta/Qos/ShaperClass.pm
+++ b/lib/Vyatta/Qos/ShaperClass.pm
@@ -43,7 +43,7 @@ sub new {
$self->{id} = $id;
bless $self, $class;
- $self->_define($config);
+ $self->_define($config) if ($config);
return $self;
}
@@ -135,7 +135,7 @@ sub prioQdisc {
if ($limit) {
foreach my $i (qw/1 2 3/) {
- printf "qdisc add dev %s parent %x:%d pfifo limit %d\n",
+ printf "qdisc add dev %s parent %x:%x pfifo limit %d\n",
$dev, $prio_id, $i, $limit;
}
}
@@ -181,8 +181,7 @@ sub redQdisc {
my $qmax = $qlimit / 8;
my $qmin = $qmax / 3;
- printf "red limit %d min %d max %d avpkt %d",
- $qlimit, $qmin, $qmax, $avg;
+ printf "red limit %d min %d max %d avpkt %d", $qlimit, $qmin, $qmax, $avg;
printf " burst %d probability 0.02 bandwidth %d ecn\n",
( 2 * $qmin + $qmax ) / ( 3 * $avg ), $rate / 1000;
}
@@ -194,29 +193,28 @@ my %qdiscOptions = (
'drop-tail' => \&fifoQdisc,
);
-sub htbClass {
- my ( $self, $dev, $parent, $speed ) = @_;
+sub gen_class {
+ my ( $self, $dev, $qdisc, $parent, $speed ) = @_;
my $rate = _getPercentRate( $self->{_rate}, $speed );
my $ceil = _getPercentRate( $self->{_ceiling}, $speed );
- printf "class add dev %s parent %x:1 classid %x:%x htb rate %s",
- $dev, $parent, $parent, $self->{id}, $rate;
+ printf "class add dev %s parent %x:1 classid %x:%x %s",
+ $dev, $parent, $parent, $self->{id}, $qdisc;
+ print " rate $rate" if ($rate);
print " ceil $ceil" if ($ceil);
- print " burst $self->{_burst}" if ( defined $self->{_burst} );
- print " prio $self->{_priority}" if ( defined $self->{_priority} );
+ print " burst $self->{_burst}" if ( $self->{_burst} );
+ print " prio $self->{_priority}" if ( $self->{_priority} );
print "\n";
+}
- # create leaf qdisc
+sub gen_leaf {
+ my ( $self, $dev, $parent, $rate ) = @_;
my $q = $qdiscOptions{ $self->{_qdisc} };
- if ( defined $q ) {
- printf "qdisc add dev %s parent %x:%x ",
- $dev, $parent, $self->{id};
- $q->( $self, $dev, $rate );
- }
- else {
- die "Unknown queue type $self->{_qdisc}\n";
- }
+ die "Unknown queue type $self->{_qdisc}\n" unless $q;
+
+ printf "qdisc add dev %s parent %x:%x ", $dev, $parent, $self->{id};
+ $q->( $self, $dev, $rate );
}
sub dsmarkClass {
diff --git a/lib/Vyatta/Qos/TrafficShaper.pm b/lib/Vyatta/Qos/TrafficShaper.pm
index 8295764..721dac9 100644
--- a/lib/Vyatta/Qos/TrafficShaper.pm
+++ b/lib/Vyatta/Qos/TrafficShaper.pm
@@ -26,43 +26,26 @@ require Vyatta::Config;
require Vyatta::Qos::ShaperClass;
use Vyatta::Qos::Util qw/getRate interfaceRate/;
-my %fields = (
- _level => undef,
- _rate => undef,
- _classes => undef,
-);
-
# Create a new instance based on config information
sub new {
my ( $that, $config, $name ) = @_;
- my $self = {%fields};
- my $class = ref($that) || $that;
+ my $rate = $config->returnValue("bandwidth");
+ my $level = $config->setLevel();
+ my @classes = _getClasses($level);
- bless $self, $class;
- $self->_define($config);
+ _checkClasses( $level, getRate($rate), @classes )
+ if ( $rate ne "auto" );
- $self->_validate($config);
+ my $self = {};
+ my $class = ref($that) || $that;
+ bless $self, $class;
+ $self->{_rate} = $rate;
+ $self->{_level} = $level;
+ $self->{_classes} = \@classes;
return $self;
}
-sub _validate {
- my $self = shift;
-
- if ( $self->{_rate} ne "auto" ) {
- my $classes = $self->{_classes};
- my $default = shift @$classes;
- my $rate = getRate( $self->{_rate} );
-
- $default->rateCheck( $rate, "$self->{_level} default" );
-
- foreach my $class (@$classes) {
- $class->rateCheck( $rate, "$self->{_level} class $class->{id}" );
- }
- unshift @$classes, $default;
- }
-}
-
# Rate can be something like "auto" or "10.2mbit"
sub _getAutoRate {
my ( $rate, $dev ) = @_;
@@ -82,39 +65,15 @@ sub _getAutoRate {
return $rate;
}
-# Setup new instance.
-# Assumes caller has done $config->setLevel to "traffic-shaper $name"
-sub _define {
- my ( $self, $config ) = @_;
- my $level = $config->setLevel();
- my @classes = ();
-
- $self->{_rate} = $config->returnValue("bandwidth");
- $self->{_level} = $level;
+sub _getClasses {
+ my $level = shift;
+ my @classes;
+ my $config = new Vyatta::Config;
+ $config->setLevel($level);
$config->exists("default")
or die "$level 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") )
- {
- next if ( $type eq 'description' );
- $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 "$level can not match on both ip and other types\n";
- }
-
$config->setLevel("$level default");
push @classes, new Vyatta::Qos::ShaperClass($config);
$config->setLevel($level);
@@ -123,7 +82,20 @@ sub _define {
$config->setLevel("$level class $id");
push @classes, new Vyatta::Qos::ShaperClass( $config, $id );
}
- $self->{_classes} = \@classes;
+
+ return @classes;
+}
+
+sub _checkClasses {
+ my $level = shift;
+ my $rate = shift;
+ my $default = shift;
+
+ $default->rateCheck( $rate, "$level default" );
+
+ foreach my $class (@_) {
+ $class->rateCheck( $rate, "$level class $class->{id}" );
+ }
}
sub commands {
@@ -191,7 +163,8 @@ sub commands {
$dev, $parent, $parent, $rate;
foreach my $class (@$classes) {
- $class->htbClass( $dev, $parent, $rate );
+ $class->gen_class( $dev, 'htb', $parent, $rate );
+ $class->gen_leaf( $dev, $parent, $rate );
foreach my $match ( $class->matchRules() ) {
$match->filter( $dev, $parent, 1, $class->{dsmark} );
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-08 01:49:38 +0000