my $level7file = "/var/ipfire/qos/level7config";
my $portfile = "/var/ipfire/qos/portconfig";
my $tosfile = "/var/ipfire/qos/tosconfig";
-my $fqcodel_options = "limit 800 quantum 500";
+my $fqcodel_options = "limit 10240 quantum 1514";
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
$qossettings{'IMQ_DEV'} = 'imq0';
$qossettings{'TOS'} = '';
$qossettings{'VALID'} = 'yes';
-$qossettings{'IMQ_MODE'} = 'PREROUTING';
&General::readhash("${General::swroot}/qos/settings", \%qossettings);
}
print <<END
- ### add l7-filter to POSTROUTING chain to see all traffic
- iptables -t mangle -A POSTROUTING -m layer7 --l7proto unset
+ ### add l7-filter to PREROUTING chain to see all traffic
+ iptables -t mangle -A PREROUTING -m layer7 --l7proto unset
### ADD QOS-OUT CHAIN TO THE MANGLE TABLE IN IPTABLES
iptables -t mangle -N QOS-OUT
### $qossettings{'IMQ_DEV'}
###
+ 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'}
- if [ `lsmod | grep -q ipt_IMQ` ]; then
- insmod ipt_IMQ
- sleep 2
+ if [ ! -d "/sys/class/net/$qossettings{'IMQ_DEV'}" ]; then
+ ip link add name $qossettings{'IMQ_DEV'} type ifb
fi
- modprobe imq numdevs=1
+
+ #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 \\
+ action mirred egress redirect dev $qossettings{'IMQ_DEV'}
+
### ADD HTB QDISC FOR $qossettings{'IMQ_DEV'}
tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1
tc qdisc add dev $qossettings{'IMQ_DEV'} root handle 2: htb default $qossettings{'DEFCLASS_INC'}
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
- iptables -t mangle -N QOS-INC
- iptables -t mangle -A POSTROUTING -i $qossettings{'RED_DEV'} -p ah -j RETURN
- iptables -t mangle -A POSTROUTING -i $qossettings{'RED_DEV'} -p esp -j RETURN
- iptables -t mangle -A POSTROUTING -i $qossettings{'RED_DEV'} -p ip -j RETURN
- iptables -t mangle -A POSTROUTING -m mark ! --mark 0 ! -o $qossettings{'RED_DEV'} -j IMQ --todev 0
- iptables -t mangle -I FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC
- iptables -t mangle -A FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS
-
- ### SET TOS
-END
-;
-}
-else
-{
print <<END
### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
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 -A PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0
- iptables -t mangle -I PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC
+ iptables -t mangle -A 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 <<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):
+ rrdtool update \$i \$(date +%s): 2>/dev/null
done
echo "Quality of Service was successfully started!"
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 -i $qossettings{'RED_DEV'} -p esp -j RETURN >/dev/null 2>&1
iptables -t mangle --delete POSTROUTING -i $qossettings{'RED_DEV'} -p ip -j RETURN >/dev/null 2>&1
iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -p ah -j RETURN >/dev/null 2>&1
iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -p esp -j RETURN >/dev/null 2>&1
iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -p ip -j RETURN >/dev/null 2>&1
- iptables -t mangle --delete POSTROUTING -m mark ! --mark 0 ! -o $qossettings{'RED_DEV'} -j IMQ --todev 0 >/dev/null 2>&1
- iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0 >/dev/null 2>&1
- # rmmod imq # this crash on 2.6.25.xx
- # REMOVE & FLUSH CHAINS
iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT >/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 >/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-OUT >/dev/null 2>&1
+ iptables -t mangle --delete-chain QOS-OUT >/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
iptables -t mangle --delete-chain QOS-TOS >/dev/null 2>&1
# remove l7-filter
- iptables -t mangle --delete POSTROUTING -m layer7 --l7proto unset
+ iptables -t mangle --delete PREROUTING -m layer7 --l7proto unset
rmmod sch_htb >/dev/null 2>&1
echo "Quality of Service was successfully cleared!"
;;
gen|generate)
- echo -n "Generateing the QoS-Scripts..."
+ echo -n "Generating the QoS-Scripts..."
/usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh
echo ".Done!"
exit 0