]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - config/qos/makeqosscripts.pl
QoS-Update - Komplette grafische Ueberarbeitung
[people/pmueller/ipfire-2.x.git] / config / qos / makeqosscripts.pl
index e7546527db23bf687aa9e1f5f08a080844242b57..0861ca4bd09e8cbcef7c81d15f51a74094e7d76e 100644 (file)
@@ -9,7 +9,7 @@
 
 use strict;
 # enable only the following on debugging purpose
-use warnings;
+use warnings;
 
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
@@ -26,14 +26,17 @@ 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 = ();
@@ -42,6 +45,7 @@ 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";
 
 &General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
 
@@ -57,6 +61,7 @@ $qossettings{'ACK'} = '';
 $qossettings{'MTU'} = '1492';
 $qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`;
 $qossettings{'IMQ_DEV'} = 'imq0';
+$qossettings{'TOS'} = '';
 $qossettings{'VALID'} = 'yes';
 
 &General::readhash("${General::swroot}/qos/settings", \%qossettings);
@@ -73,6 +78,9 @@ close FILE;
 open( FILE, "< $portfile" ) or die "Unable to read $portfile";
 @portrules = <FILE>;
 close FILE;
+open( FILE, "< $tosfile" ) or die "Unable to read $tosfile";
+@tosrules = <FILE>;
+close FILE;
 
 ############################################################################################################################
 ############################################################################################################################
@@ -93,24 +101,40 @@ print <<END
 case "\$1" in
 
   status)
-       echo "[qdisc]"
-       tc -s qdisc show dev $qossettings{'RED_DEV'}
-       tc -s qdisc show dev $qossettings{'IMQ_DEV'}
-       echo "[class]"
-       tc -s class show dev $qossettings{'RED_DEV'}
-       tc -s class show dev $qossettings{'IMQ_DEV'}
-       echo "[filter]"
-       tc -s filter show dev $qossettings{'RED_DEV'}
-       tc -s filter show dev $qossettings{'IMQ_DEV'}
-       echo "[iptables]"
-       iptables -t mangle -L QOS-OUT -v -x 2> /dev/null
-       iptables -t mangle -L QOS-INC -v -x 2> /dev/null
+       case "\$2" in
+         qdisc)
+               echo "[qdisc]"
+               tc -s qdisc show dev $qossettings{'RED_DEV'}
+               tc -s qdisc show dev $qossettings{'IMQ_DEV'}
+               exit 0
+         ;;
+         class)
+               echo "[class]"
+               tc -s class show dev $qossettings{'RED_DEV'}
+               tc -s class show dev $qossettings{'IMQ_DEV'}
+               exit 0
+         ;;
+         filter)
+               echo "[filter]"
+               tc -s filter show dev $qossettings{'RED_DEV'}
+               tc -s filter show dev $qossettings{'IMQ_DEV'}
+               exit 0
+         ;;
+         iptables)
+               echo "[iptables]"
+               iptables -t mangle -n -L QOS-OUT -v -x 2> /dev/null
+               iptables -t mangle -n -L QOS-INC -v -x 2> /dev/null
+               iptables -t mangle -n -L QOS-TOS -v -x 2> /dev/null
+               exit 0
+         ;;
+       esac
+       \$0 \$1 qdisc
+       \$0 \$1 class
+       \$0 \$1 filter
+       \$0 \$1 iptables
        exit 0
   ;;
   start)
-       ### FIRST CLEAR EVERYTHING
-       \$0 clear
-
        ###
        ### $qossettings{'RED_DEV'}
        ###
@@ -143,10 +167,10 @@ foreach $classentry (sort @classes)
                $qossettings{'BURST'} = $classline[5];
                $qossettings{'CBURST'} = $classline[6];
                print "\ttc class add dev $qossettings{'DEVICE'} parent 1:1 classid 1:$qossettings{'CLASS'} htb rate $qossettings{'RATE'}kbit ceil $qossettings{'CEIL'}kbit prio $qossettings{'PRIO'} ";
-               if ($qossettings{'BURST'} > 0) {
+               if (($qossettings{'BURST'} ne '') && ($qossettings{'BURST'} ne 0)) {
                        print "burst $qossettings{'BURST'}k ";
                }
-               if (($qossettings{'CBURST'} ne '') || ($qossettings{'CBURST'} ne 0)) {
+               if (($qossettings{'CBURST'} ne '') && ($qossettings{'CBURST'} ne 0)) {
                        print "cburst $qossettings{'CBURST'}k";
                }
                print "\n";
@@ -154,22 +178,24 @@ foreach $classentry (sort @classes)
 }
 foreach $subclassentry (sort @subclasses) {
        @subclassline = split( /\;/, $subclassentry );
-       $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";
+       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";
 }
 
 print "\n\t### ATTACH QDISC TO LEAF CLASSES\n";
@@ -206,14 +232,16 @@ foreach $subclassentry (sort @subclasses) {
                $qossettings{'DEVICE'} = $subclassline[0];
                $qossettings{'CLASS'} = $subclassline[1];
                $qossettings{'SCLASS'} = $subclassline[2];
-               print "\ttc filter add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 1:$qossettings{'SCLASS'}\n";
+               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 QOS-OUT CHAIN TO THE MANGLE TABLE IN IPTABLES
        iptables -t mangle -N QOS-OUT
+       iptables -t mangle -N QOS-TOS
        iptables -t mangle -I POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT
+       iptables -t mangle -A POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS
 
        ### MARK ACKs
        iptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} -p tcp --tcp-flags SYN,RST SYN -j TOS --set-tos 4
@@ -247,29 +275,20 @@ print <<END
        iptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} -p tcp --tcp-flags ALL ACK,FIN -j MARK --set-mark $qossettings{'ACK'}
        iptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} -p tcp --tcp-flags ALL ACK,FIN -j RETURN
 
-       ### SET LEVEL7-RULES
+       ### SET TOS
 END
 ;
-       foreach $l7ruleentry (sort @l7rules)
+       foreach $tosruleentry (sort @tosrules)
        {
-               @l7ruleline = split( /\;/, $l7ruleentry );
-               if ( $l7ruleline[1] eq $qossettings{'RED_DEV'} )
+               @tosruleline = split( /\;/, $tosruleentry );
+               $qossettings{'CLASS'} = $tosruleline[0];
+               $qossettings{'TOS'} = abs $tosruleline[2] * 2;
+               if ( $tosruleline[1] eq $qossettings{'RED_DEV'} )
                {
-                       $qossettings{'CLASS'} = $l7ruleline[0];
-                       $qossettings{'DEVICE'} = $l7ruleline[1];
-                       $qossettings{'L7PROT'} = $l7ruleline[2];
-                       $qossettings{'QIP'} = $l7ruleline[3];
-                       $qossettings{'DIP'} = $l7ruleline[4];
-                       print "\tiptables -t mangle -A QOS-OUT -o $qossettings{'DEVICE'} ";
-                       if ($qossettings{'QIP'} ne ''){
-                               print "-s $qossettings{'QIP'} ";
-                       }
-                       if ($qossettings{'DIP'} ne ''){
-                               print "-d $qossettings{'DIP'} ";
-                       }
-                       print "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettings{'L7PROT'} -j MARK --set-mark $qossettings{'CLASS'}\n";
-               }
-       }
+                       print "\tiptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} -m tos --tos $qossettings{'TOS'} -j MARK --set-mark $qossettings{'CLASS'}\n";
+                       print "\tiptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} -m tos --tos $qossettings{'TOS'} -j RETURN\n";
+               }
+       }
 
 print "\n\t### SET PORT-RULES\n";
        foreach $portruleentry (sort @portrules)
@@ -284,7 +303,7 @@ print "\n\t### SET PORT-RULES\n";
                        $qossettings{'QPORT'} = $portruleline[4];
                        $qossettings{'DIP'} = $portruleline[5];
                        $qossettings{'DPORT'} = $portruleline[6];
-                       print "\tiptables -t mangle -A QOS-OUT -o $qossettings{'DEVICE'} ";
+                       print "\tiptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} ";
                        if ($qossettings{'QIP'} ne ''){
                                print "-s $qossettings{'QIP'} ";
                        }
@@ -302,7 +321,7 @@ print "\n\t### SET PORT-RULES\n";
                                print "--dport $qossettings{'DPORT'} ";
                        }
                        print "-j MARK --set-mark $qossettings{'CLASS'}\n";
-                       print "\tiptables -t mangle -A QOS-OUT -o $qossettings{'DEVICE'} ";
+                       print "\tiptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} ";
                        if ($qossettings{'QIP'} ne ''){
                                print "-s $qossettings{'QIP'} ";
                        }
@@ -323,22 +342,60 @@ print "\n\t### SET PORT-RULES\n";
                }
        }
 
+print <<END
+
+       ### SET LEVEL7-RULES
+END
+;
+       foreach $l7ruleentry (sort @l7rules)
+       {
+               @l7ruleline = split( /\;/, $l7ruleentry );
+               if ( $l7ruleline[1] eq $qossettings{'RED_DEV'} )
+               {
+                       $qossettings{'CLASS'} = $l7ruleline[0];
+                       $qossettings{'DEVICE'} = $l7ruleline[1];
+                       $qossettings{'L7PROT'} = $l7ruleline[2];
+                       $qossettings{'QIP'} = $l7ruleline[3];
+                       $qossettings{'DIP'} = $l7ruleline[4];
+                       print "\tiptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} ";
+                       if ($qossettings{'QIP'} ne ''){
+                               print "-s $qossettings{'QIP'} ";
+                       }
+                       if ($qossettings{'DIP'} ne ''){
+                               print "-d $qossettings{'DIP'} ";
+                       }
+                       print "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettings{'L7PROT'} -j MARK --set-mark $qossettings{'CLASS'}\n";
+                       print "\tiptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} ";
+                       if ($qossettings{'QIP'} ne ''){
+                               print "-s $qossettings{'QIP'} ";
+                       }
+                       if ($qossettings{'DIP'} ne ''){
+                               print "-d $qossettings{'DIP'} ";
+                       }
+                       print "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettings{'L7PROT'} -j RETURN\n";
+               }
+       }
+
 print <<END
 
        ### REDUNDANT: SET ALL NONMARKED PACKETS TO DEFAULT CLASS
-       iptables -t mangle -A QOS-OUT -m mark --mark 0 -j MARK --set-mark $qossettings{'DEFCLASS_OUT'}
+       iptables -t mangle -A QOS-OUT -o $qossettings{'RED_DEV'} -m mark --mark 0 -j MARK --set-mark $qossettings{'DEFCLASS_OUT'}
 
        ###
        ### $qossettings{'IMQ_DEV'}
        ###
 
        ### BRING UP $qossettings{'IMQ_DEV'}
+       if [ `lsmod | grep -q ipt_IMQ` ]; then
+               insmod ipt_IMQ
+               sleep 2
+       fi
        modprobe imq numdevs=1
        ip link set $qossettings{'IMQ_DEV'} up
 
        ### SET QUEUE LENGTH & MTU - has just to be tested!!! IMPORTANT
        ip link set dev $qossettings{'IMQ_DEV'} qlen $qossettings{'QLENGTH'}
-       ip link set dev $qossettings{'IMQ_DEV'} mtu $qossettings{'MTU'}
+       ip link set dev $qossettings{'IMQ_DEV'} mtu $qossettings{'MTU'}
 
        ### ADD HTB QDISC FOR $qossettings{'IMQ_DEV'}
        tc qdisc add dev $qossettings{'IMQ_DEV'} root handle 2: htb default $qossettings{'DEFCLASS_INC'}
@@ -361,10 +418,10 @@ foreach $classentry (sort @classes)
                $qossettings{'BURST'} = $classline[5];
                $qossettings{'CBURST'} = $classline[6];
                print "\ttc class add dev $qossettings{'DEVICE'} parent 2:1 classid 2:$qossettings{'CLASS'} htb rate $qossettings{'RATE'}kbit ceil $qossettings{'CEIL'}kbit prio $qossettings{'PRIO'} ";
-               if ($qossettings{'BURST'} > 0) {
+               if (($qossettings{'BURST'} ne '') && ($qossettings{'BURST'} ne 0)) {
                        print "burst $qossettings{'BURST'}k ";
                }
-               if (($qossettings{'CBURST'} ne '') || ($qossettings{'CBURST'} ne 0)) {
+               if (($qossettings{'CBURST'} ne '') && ($qossettings{'CBURST'} ne 0)) {
                        print "cburst $qossettings{'CBURST'}k";
                }
                print "\n";
@@ -385,7 +442,7 @@ foreach $subclassentry (sort @subclasses) {
                if ($qossettings{'SBURST'} > 0) {
                        print "burst $qossettings{'SBURST'}k ";
                }
-               if (($qossettings{'SCBURST'} ne '') || ($qossettings{'SCBURST'} ne 0)) {
+               if (($qossettings{'SCBURST'} ne '') && ($qossettings{'SCBURST'} ne 0)) {
                        print "cburst $qossettings{'CBURST'}k";
                }
                print "\n";
@@ -426,38 +483,32 @@ foreach $subclassentry (sort @subclasses) {
                $qossettings{'DEVICE'} = $subclassline[0];
                $qossettings{'CLASS'} = $subclassline[1];
                $qossettings{'SCLASS'} = $subclassline[2];
-               print "\ttc filter add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 2:$qossettings{'SCLASS'}\n";
+               print "\ttc filter add dev $qossettings{'DEVICE'} parent 2:0 prio 0 protocol ip handle $qossettings{'SCLASS'} fw flowid 2:$qossettings{'SCLASS'}\n";
        }
 }
 print <<END
 
-       ### ADD QOS-OUT CHAIN TO THE MANGLE TABLE IN IPTABLES
+       ### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
        iptables -t mangle -N QOS-INC
-       iptables -t mangle -I POSTROUTING -o $qossettings{'IMQ_DEV'} -j QOS-INC
+       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-TOS
 
-       ### SET LEVEL7-RULES
+       ### SET TOS
 END
 ;
-       foreach $l7ruleentry (sort @l7rules)
+       foreach $tosruleentry (sort @tosrules)
        {
-               @l7ruleline = split( /\;/, $l7ruleentry );
-               if ( $l7ruleline[1] eq $qossettings{'IMQ_DEV'} )
+               @tosruleline = split( /\;/, $tosruleentry );
+               $qossettings{'CLASS'} = $tosruleline[0];
+               $qossettings{'TOS'} = abs $tosruleline[2] * 2;
+               if ( $tosruleline[1] eq $qossettings{'IMQ_DEV'} )
                {
-                       $qossettings{'CLASS'} = $l7ruleline[0];
-                       $qossettings{'DEVICE'} = $l7ruleline[1];
-                       $qossettings{'L7PROT'} = $l7ruleline[2];
-                       $qossettings{'QIP'} = $l7ruleline[3];
-                       $qossettings{'DIP'} = $l7ruleline[4];
-                       print "\tiptables -t mangle -A QOS-INC -o $qossettings{'DEVICE'} ";
-                       if ($qossettings{'QIP'} ne ''){
-                               print "-s $qossettings{'QIP'} ";
-                       }
-                       if ($qossettings{'DIP'} ne ''){
-                               print "-d $qossettings{'DIP'} ";
-                       }
-                       print "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettings{'L7PROT'} -j MARK --set-mark $qossettings{'CLASS'}\n";
-               }
-       }
+                       print "\tiptables -t mangle -A QOS-INC -i $qossettings{'RED_DEV'} -m tos --tos $qossettings{'TOS'} -j MARK --set-mark $qossettings{'CLASS'}\n";
+                       print "\tiptables -t mangle -A QOS-INC -i $qossettings{'RED_DEV'} -m tos --tos $qossettings{'TOS'} -j RETURN\n";
+               }
+
+       }
 
 print "\n\t### SET PORT-RULES\n";
        foreach $portruleentry (sort @portrules)
@@ -472,7 +523,7 @@ print "\n\t### SET PORT-RULES\n";
                        $qossettings{'QPORT'} = $portruleline[4];
                        $qossettings{'DIP'} = $portruleline[5];
                        $qossettings{'DPORT'} = $portruleline[6];
-                       print "\tiptables -t mangle -A QOS-INC -o $qossettings{'DEVICE'} ";
+                       print "\tiptables -t mangle -A QOS-INC -i $qossettings{'RED_DEV'} ";
                        if ($qossettings{'QIP'} ne ''){
                                print "-s $qossettings{'QIP'} ";
                        }
@@ -490,7 +541,7 @@ print "\n\t### SET PORT-RULES\n";
                                print "--dport $qossettings{'DPORT'} ";
                        }
                        print "-j MARK --set-mark $qossettings{'CLASS'}\n";
-                       print "\tiptables -t mangle -A QOS-INC -o $qossettings{'DEVICE'} ";
+                       print "\tiptables -t mangle -A QOS-INC -i $qossettings{'RED_DEV'} ";
                        if ($qossettings{'QIP'} ne ''){
                                print "-s $qossettings{'QIP'} ";
                        }
@@ -513,30 +564,113 @@ print "\n\t### SET PORT-RULES\n";
 
 print <<END
 
+       ### SET LEVEL7-RULES
+END
+;
+       foreach $l7ruleentry (sort @l7rules)
+       {
+               @l7ruleline = split( /\;/, $l7ruleentry );
+               if ( $l7ruleline[1] eq $qossettings{'IMQ_DEV'} )
+               {
+                       $qossettings{'CLASS'} = $l7ruleline[0];
+                       $qossettings{'DEVICE'} = $l7ruleline[1];
+                       $qossettings{'L7PROT'} = $l7ruleline[2];
+                       $qossettings{'QIP'} = $l7ruleline[3];
+                       $qossettings{'DIP'} = $l7ruleline[4];
+                       print "\tiptables -t mangle -A QOS-INC -i $qossettings{'RED_DEV'} ";
+                       if ($qossettings{'QIP'} ne ''){
+                               print "-s $qossettings{'QIP'} ";
+                       }
+                       if ($qossettings{'DIP'} ne ''){
+                               print "-d $qossettings{'DIP'} ";
+                       }
+                       print "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettings{'L7PROT'} -j MARK --set-mark $qossettings{'CLASS'}\n";
+                       print "\tiptables -t mangle -A QOS-INC -i $qossettings{'RED_DEV'} ";
+                       if ($qossettings{'QIP'} ne ''){
+                               print "-s $qossettings{'QIP'} ";
+                       }
+                       if ($qossettings{'DIP'} ne ''){
+                               print "-d $qossettings{'DIP'} ";
+                       }
+                       print "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettings{'L7PROT'} -j RETURN\n";
+               }
+       }
+
+print <<END
        ### REDUNDANT: SET ALL NONMARKED PACKETS TO DEFAULT CLASS
-       iptables -t mangle -A QOS-INC -m mark --mark 0 -j MARK --set-mark $qossettings{'DEFCLASS_INC'}
+       iptables -t mangle -A QOS-INC -i $qossettings{'RED_DEV'} -m mark --mark 0 -j MARK --set-mark $qossettings{'DEFCLASS_INC'}
+
+       ### SETTING TOS BITS
+END
+;
+       foreach $classentry (sort @classes)
+       {
+               @classline = split( /\;/, $classentry );
+               $qossettings{'CLASS'} = $classline[1];
+               $qossettings{'TOS'} = abs $classline[7] * 2;
+               if ($qossettings{'TOS'} ne "0") {
+                       print "\tiptables -t mangle -A QOS-TOS -m mark --mark $qossettings{'CLASS'} -j TOS --set-tos $qossettings{'TOS'}\n";
+                       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
+       /usr/local/bin/qosd $qossettings{'RED_DEV'} >/dev/null 2>&1
+       /usr/local/bin/qosd $qossettings{'IMQ_DEV'} >/dev/null 2>&1
 
        echo "Quality of Service was successfully started!"
        exit 0
   ;;
-  clear)
+  clear|stop)
        ### RESET EVERYTHING TO A KNOWN STATE
+       killall -9 qosd
        # DELETE QDISCS
-       tc qdisc del dev $qossettings{'RED_DEV'} root &> /dev/null
-       tc qdisc del dev $qossettings{'IMQ_DEV'} root &> /dev/null
-       # REMOVE & FLUSH CHAINS
-       iptables -t mangle -D POSTROURING -o $qossettings{'RED_DEV'} -j QOS-OUT &> /dev/null
-       iptables -t mangle -F QOS-OUT &> /dev/null
-       iptables -t mangle -X QOS-OUT &> /dev/null
-       iptables -t mangle -D POSTROURING -o $qossettings{'IMQ_DEV'} -j QOS-INC &> /dev/null
-       iptables -t mangle -F QOS-INC &> /dev/null
-       iptables -t mangle -X QOS-INC &> /dev/null
+       tc qdisc del dev $qossettings{'RED_DEV'} root
+       tc qdisc del dev $qossettings{'IMQ_DEV'} root
        # STOP IMQ-DEVICE
-       ip link set $qossettings{'IMQ_DEV'} down &> /dev/null
-       rmmod imq &> /dev/null
-       rmmod sch_htb &> /dev/null
+       ip link set $qossettings{'IMQ_DEV'} down
+       iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0
+       rmmod imq
+       # REMOVE & FLUSH CHAINS
+       iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT
+       iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-TOS
+       iptables -t mangle --flush  QOS-OUT
+       iptables -t mangle --delete-chain QOS-OUT
+       iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC
+       iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j QOS-TOS
+       iptables -t mangle --flush  QOS-INC
+       iptables -t mangle --delete-chain QOS-INC
+       iptables -t mangle --flush  QOS-TOS
+       iptables -t mangle --delete-chain QOS-TOS
+       rmmod sch_htb
        echo "Quality of Service was successfully cleared!"
   ;;
+  gen|generate)
+       echo -n "Generateing the QoS-Scripts..."
+       /usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh
+       echo ".Done!"
+       exit 0
+       ;;
+  restart)
+       ### FIRST CLEAR EVERYTHING
+       \$0 clear
+
+       ### THEN START
+       \$0 start
+       ;;
 esac
 ### EOF
 END
@@ -544,4 +678,3 @@ END
 
 ############################################################################################################################
 ############################################################################################################################
-