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";
$qossettings{'IMQ_DEV'} = 'imq0';
$qossettings{'TOS'} = '';
$qossettings{'VALID'} = 'yes';
+$qossettings{'IMQ_MODE'} = 'PREROUTING';
&General::readhash("${General::swroot}/qos/settings", \%qossettings);
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;
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)
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)
{
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
### $qossettings{'IMQ_DEV'}
###
- tc qdisc del dev $qossettings{'RED_DEV'} root
- tc qdisc del dev $qossettings{'RED_DEV'} ingress
+ tc qdisc del dev $qossettings{'RED_DEV'} ingress >/dev/null 2>&1
tc qdisc add dev $qossettings{'RED_DEV'} handle ffff: ingress
### BRING UP $qossettings{'IMQ_DEV'}
ip link add name $qossettings{'IMQ_DEV'} type ifb
fi
- #tc qdisc del dev $qossettings{'IMQ_DEV'} root
- #tc qdisc del dev $qossettings{'IMQ_DEV'} ingress
ip link set $qossettings{'IMQ_DEV'} up
tc filter add dev $qossettings{'RED_DEV'} parent ffff: protocol all u32 match u32 0 0 \\
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)
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)
{
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' )
+{
print <<END
### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
### SET TOS
END
;
+}
+else
+{
+print <<END
+
+ ### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
+ iptables -t mangle -N QOS-INC
+ iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -p ah -j RETURN
+ iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -p esp -j RETURN
+ iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -p ip -j RETURN
+ iptables -t mangle -I PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC
+ iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS
+
+ ### SET TOS
+END
+;
+}
+
foreach $tosruleentry (sort @tosrules)
{
@tosruleline = split( /\;/, $tosruleentry );
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
## STARTING COLLECTOR
- ( sleep 10 && /usr/local/bin/qosd $qossettings{'RED_DEV'} >/dev/null 2>&1) &
- ( sleep 10 && /usr/local/bin/qosd $qossettings{'IMQ_DEV'} >/dev/null 2>&1) &
+ /usr/local/bin/qosd $qossettings{'RED_DEV'} >/dev/null 2>&1
+ /usr/local/bin/qosd $qossettings{'IMQ_DEV'} >/dev/null 2>&1
for i in \$(ls \$RRDLOG/class_*.rrd); do
rrdtool update \$i \$(date +%s): 2>/dev/null
clear|stop)
### RESET EVERYTHING TO A KNOWN STATE
killall qosd >/dev/null 2>&1
- (sleep 3 && killall -9 qosd &>/dev/null) &
+
# DELETE QDISCS
tc qdisc del dev $qossettings{'RED_DEV'} root >/dev/null 2>&1
+ tc qdisc del dev $qossettings{'RED_DEV'} ingress >/dev/null 2>&1
tc qdisc add root dev $qossettings{'RED_DEV'} fq_codel >/dev/null 2>&1
tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1
+ tc qdisc del dev $qossettings{'IMQ_DEV'} ingress >/dev/null 2>&1
tc qdisc add root dev $qossettings{'IMQ_DEV'} fq_codel >/dev/null 2>&1
# STOP IMQ-DEVICE
ip link set $qossettings{'IMQ_DEV'} down >/dev/null 2>&1
+ ip link del $qossettings{'IMQ_DEV'} >/dev/null 2>&1
# REMOVE & FLUSH CHAINS
iptables -t mangle --delete POSTROUTING -i $qossettings{'RED_DEV'} -p ah -j RETURN >/dev/null 2>&1
iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1
iptables -t mangle --flush QOS-OUT >/dev/null 2>&1
iptables -t mangle --delete-chain QOS-OUT >/dev/null 2>&1
- iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC
- iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS
+ iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC >/dev/null 2>&1
+ iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1
+ iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC >/dev/null 2>&1
+ iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS >/dev/null 2>&1
iptables -t mangle --flush QOS-INC >/dev/null 2>&1
iptables -t mangle --delete-chain QOS-INC >/dev/null 2>&1
iptables -t mangle --flush QOS-TOS >/dev/null 2>&1
projects / people / mfischer / ipfire-2.x.git / blobdiff