Make IMQ Switchable between PREROUTING and POSTROUTING

[people/pmueller/ipfire-2.x.git] / config / qos / makeqosscripts.pl

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index fa0b6edf045a372d125ee0e03c18588fe146b984..a374a383bb111b02ccadc5bd3b28332a744e2453 100644 (file)
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -75,6 +75,7 @@ $qossettings{'RED_DEV'} = `cat /var/ipfire/red/iface`;
 $qossettings{'IMQ_DEV'} = 'imq0';
 $qossettings{'TOS'} = '';
 $qossettings{'VALID'} = 'yes';
+$qossettings{'IMQ_MODE'} = 'PREROUTING';
 
 &General::readhash("${General::swroot}/qos/settings", \%qossettings);
 
@@ -156,7 +157,7 @@ case "\$1" in
 
        ### SET QUEUE LENGTH & MTU - has just to be tested!!! IMPORTANT
        ip link set dev $qossettings{'RED_DEV'} qlen $qossettings{'QLENGTH'}
-       ip link set dev $qossettings{'RED_DEV'} mtu $qossettings{'MTU'}
+       #ip link set dev $qossettings{'RED_DEV'} mtu $qossettings{'MTU'}
 
        ### ADD HTB QDISC FOR $qossettings{'RED_DEV'}
        tc qdisc add dev $qossettings{'RED_DEV'} root handle 1: htb default $qossettings{'DEFCLASS_OUT'}
@@ -323,9 +324,9 @@ print "\n\t### SET PORT-RULES\n";
                                print "-d $qossettings{'DIP'} ";
                        }
                        print "-p $qossettings{'PPROT'} ";
-                       if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
-                               print "-m multiport ";
-                       }
+#                      if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
+#                              print "-m multiport ";
+#                      }
                        if ($qossettings{'QPORT'} ne ''){
                                print "--sport $qossettings{'QPORT'} ";
                        }
@@ -341,9 +342,9 @@ print "\n\t### SET PORT-RULES\n";
                                print "-d $qossettings{'DIP'} ";
                        }
                        print "-p $qossettings{'PPROT'} ";
-                       if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
-                               print "-m multiport ";
-                       }
+#                      if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
+#                              print "-m multiport ";
+#                      }
                        if ($qossettings{'QPORT'} ne ''){
                                print "--sport $qossettings{'QPORT'} ";
                        }
@@ -498,6 +499,23 @@ foreach $subclassentry (sort @subclasses) {
                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 -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
@@ -509,6 +527,8 @@ print <<END
        ### SET TOS
 END
 ;
+}
+
        foreach $tosruleentry (sort @tosrules)
        {
                @tosruleline = split( /\;/, $tosruleentry );
@@ -543,9 +563,9 @@ print "\n\t### SET PORT-RULES\n";
                                print "-d $qossettings{'DIP'} ";
                        }
                        print "-p $qossettings{'PPROT'} ";
-                       if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
-                               print "-m multiport ";
-                       }
+#                      if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
+#                              print "-m multiport ";
+#                      }
                        if ($qossettings{'QPORT'} ne ''){
                                print "--sport $qossettings{'QPORT'} ";
                        }
@@ -561,9 +581,9 @@ print "\n\t### SET PORT-RULES\n";
                                print "-d $qossettings{'DIP'} ";
                        }
                        print "-p $qossettings{'PPROT'} ";
-                       if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
-                               print "-m multiport ";
-                       }
+#                      if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
+#                              print "-m multiport ";
+#                      }
                        if ($qossettings{'QPORT'} ne ''){
                                print "--sport $qossettings{'QPORT'} ";
                        }
@@ -648,27 +668,30 @@ print <<END
   ;;
   clear|stop)
        ### RESET EVERYTHING TO A KNOWN STATE
-       killall qosd
+       killall qosd >/dev/null 2>&1
        (sleep 3 && killall -9 qosd &>/dev/null) &
        # DELETE QDISCS
-       tc qdisc del dev $qossettings{'RED_DEV'} root
-       tc qdisc del dev $qossettings{'IMQ_DEV'} root
+       tc qdisc del dev $qossettings{'RED_DEV'} root >/dev/null 2>&1
+       tc qdisc del dev $qossettings{'IMQ_DEV'} root >/dev/null 2>&1
        # STOP IMQ-DEVICE
-       ip link set $qossettings{'IMQ_DEV'} down
-       iptables -t mangle --delete PREROUTING -i $qossettings{'RED_DEV'} -j IMQ --todev 0
-       rmmod imq
+       ip link set $qossettings{'IMQ_DEV'} down >/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
-       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
+       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-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
+       rmmod sch_htb >/dev/null 2>&1
        echo "Quality of Service was successfully cleared!"
   ;;
   gen|generate)