webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-25 02:12:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

QoS: Drop support for subclasses

Browse Source 
This feature was never properly implemented and the UI was dead

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Daniel Weismüller <daniel.weismueller@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Michael Tremer
2019-10-21 20:45:32 +02:00
committed by Arne Fitzenreiter
parent 8d6b654369
commit afe23fbb52
11 changed files with 32 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
config/qos/makeqosscripts.pl
View File

@@ -35,26 +35,22 @@ my $errormessage = "";
my $c = "";
my $direntry = "";
my $classentry = "";
my $subclassentry = "";
my $l7ruleentry = "";
my $portruleentry = "";
my $tosruleentry = "";
my @tmp = ();
my @classes = ();
my @subclasses = ();
my @l7rules = ();
my @portrules = ();
my @tosrules = ();
my @tmpline = ();
my @classline = ();
my @subclassline = ();
my @tosruleline = ();
my @l7ruleline = ();
my @portruleline = ();
my @proto = ();
my %selected= () ;
my $classfile = "/var/ipfire/qos/classes";
my $subclassfile = "/var/ipfire/qos/subclasses";
my $level7file = "/var/ipfire/qos/level7config";
my $portfile = "/var/ipfire/qos/portconfig";
my $tosfile = "/var/ipfire/qos/tosconfig";
@@ -82,9 +78,6 @@ $qossettings{'IMQ_MODE'} = 'PREROUTING';
open( FILE, "< $classfile" ) or die "Unable to read $classfile";
@classes = <FILE>;
close FILE;
open( FILE, "< $subclassfile" ) or die "Unable to read $subclassfile";
@subclasses = <FILE>;
close FILE;
open( FILE, "< $level7file" ) or die "Unable to read $level7file";
@l7rules = <FILE>;
close FILE;
@@ -191,27 +184,6 @@ foreach $classentry (sort @classes)
print "\n";
}
}
foreach $subclassentry (sort @subclasses) {
@subclassline = split( /\;/, $subclassentry );
if ($qossettings{'RED_DEV'} eq $subclassline[0]) {
$qossettings{'DEVICE'} = $subclassline[0];
$qossettings{'CLASS'} = $subclassline[1];
$qossettings{'SCLASS'} = $subclassline[2];
$qossettings{'SPRIO'} = $subclassline[3];
$qossettings{'SRATE'} = $subclassline[4];
$qossettings{'SCEIL'} = $subclassline[5];
$qossettings{'SBURST'} = $subclassline[6];
$qossettings{'SCBURST'} = $subclassline[7];
print "\ttc class add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} classid 1:$qossettings{'SCLASS'} htb rate $qossettings{'SRATE'}kbit ceil $qossettings{'SCEIL'}kbit prio $qossettings{'SPRIO'} ";
if ($qossettings{'SBURST'} > 0) {
print "burst $qossettings{'SBURST'}k ";
}
if (($qossettings{'SCBURST'} ne '') && ($qossettings{'SCBURST'} ne 0)) {
print "cburst $qossettings{'CBURST'}k";
}
print "\n";
}
}
print "\n\t### ATTACH QDISC TO LEAF CLASSES\n";
foreach $classentry (sort @classes)
@@ -223,14 +195,6 @@ foreach $classentry (sort @classes)
print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n";
}
}
foreach $subclassentry (sort @subclasses) {
@subclassline = split( /\;/, $subclassentry );
if ($qossettings{'RED_DEV'} eq $subclassline[0]) {
$qossettings{'DEVICE'} = $subclassline[0];
$qossettings{'SCLASS'} = $subclassline[2];
print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: fq_codel $fqcodel_options\n";
}
}
print "\n\t### FILTER TRAFFIC INTO CLASSES\n";
foreach $classentry (sort @classes)
{
@@ -241,15 +205,6 @@ foreach $classentry (sort @classes)
print "\ttc filter add dev $qossettings{'DEVICE'} parent 1:0 prio 0 protocol ip handle $qossettings{'CLASS'} fw flowid 1:$qossettings{'CLASS'}\n";
}
}
foreach $subclassentry (sort @subclasses) {
@subclassline = split( /\;/, $subclassentry );
if ($qossettings{'RED_DEV'} eq $subclassline[0]) {
$qossettings{'DEVICE'} = $subclassline[0];
$qossettings{'CLASS'} = $subclassline[1];
$qossettings{'SCLASS'} = $subclassline[2];
print "\ttc filter add dev $qossettings{'DEVICE'} parent 1:0 prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 1:$qossettings{'SCLASS'}\n";
}
}
print <<END
### add l7-filter to PREROUTING chain to see all traffic
@@ -450,27 +405,6 @@ foreach $classentry (sort @classes)
print "\n";
}
}
foreach $subclassentry (sort @subclasses) {
@subclassline = split( /\;/, $subclassentry );
if ($qossettings{'IMQ_DEV'} eq $subclassline[0]) {
$qossettings{'DEVICE'} = $subclassline[0];
$qossettings{'CLASS'} = $subclassline[1];
$qossettings{'SCLASS'} = $subclassline[2];
$qossettings{'SPRIO'} = $subclassline[3];
$qossettings{'SRATE'} = $subclassline[4];
$qossettings{'SCEIL'} = $subclassline[5];
$qossettings{'SBURST'} = $subclassline[6];
$qossettings{'SCBURST'} = $subclassline[7];
print "\ttc class add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} classid 2:$qossettings{'SCLASS'} htb rate $qossettings{'SRATE'}kbit ceil $qossettings{'SCEIL'}kbit prio $qossettings{'SPRIO'} ";
if ($qossettings{'SBURST'} > 0) {
print "burst $qossettings{'SBURST'}k ";
}
if (($qossettings{'SCBURST'} ne '') && ($qossettings{'SCBURST'} ne 0)) {
print "cburst $qossettings{'CBURST'}k";
}
print "\n";
}
}
print "\n\t### ATTACH QDISC TO LEAF CLASSES\n";
foreach $classentry (sort @classes)
@@ -482,14 +416,6 @@ foreach $classentry (sort @classes)
print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n";
}
}
foreach $subclassentry (sort @subclasses) {
@subclassline = split( /\;/, $subclassentry );
if ($qossettings{'IMQ_DEV'} eq $subclassline[0]) {
$qossettings{'DEVICE'} = $subclassline[0];
$qossettings{'SCLASS'} = $subclassline[2];
print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: fq_codel $fqcodel_options\n";
}
}
print "\n\t### FILTER TRAFFIC INTO CLASSES\n";
foreach $classentry (sort @classes)
{
@@ -500,15 +426,6 @@ foreach $classentry (sort @classes)
print "\ttc filter add dev $qossettings{'DEVICE'} parent 2:0 prio 0 protocol ip handle $qossettings{'CLASS'} fw flowid 2:$qossettings{'CLASS'}\n";
}
}
foreach $subclassentry (sort @subclasses) {
@subclassline = split( /\;/, $subclassentry );
if ($qossettings{'IMQ_DEV'} eq $subclassline[0]) {
$qossettings{'DEVICE'} = $subclassline[0];
$qossettings{'CLASS'} = $subclassline[1];
$qossettings{'SCLASS'} = $subclassline[2];
print "\ttc filter add dev $qossettings{'DEVICE'} parent 2:0 prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 2:$qossettings{'SCLASS'}\n";
}
}
if ( $qossettings{'IMQ_MODE'} eq 'POSTROUTING' )
{
@@ -659,17 +576,6 @@ END
print "\tiptables -t mangle -A QOS-TOS -m mark --mark $qossettings{'CLASS'} -j RETURN\n";
}
}
foreach $subclassentry (sort @subclasses)
{
@subclassline = split( /\;/, $subclassentry );
$qossettings{'SUBCLASS'} = $subclassline[1];
$qossettings{'TOS'} = $subclassline[8];
$qossettings{'TOS'} = abs $qossettings{'TOS'} * 2;
if ($qossettings{'TOS'} ne "0") {
print "\tiptables -t mangle -A QOS-TOS -m mark --mark $qossettings{'SUBCLASS'} -j TOS --set-tos $qossettings{'TOS'}\n";
print "\tiptables -t mangle -A QOS-TOS -m mark --mark $qossettings{'SUBCLASS'} -j RETURN\n";
}
}
print <<END