QoS: Delete more unused iptables commands

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

diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index ff4cbcb1222fdcbf0bce766483f617f3ea74fe73..1a5d01d5231b5d402f22b0f6663063120e75d133 100644 (file)
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -124,6 +124,12 @@ case "\$1" in
                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
@@ -133,6 +139,7 @@ case "\$1" in
        esac
        \$0 \$1 qdisc
        \$0 \$1 class
+       \$0 \$1 filter
        \$0 \$1 iptables
        exit 0
   ;;
@@ -186,8 +193,21 @@ foreach $classentry (sort @classes)
                print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 1:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n";
        }
 }
+print "\n\t### FILTER TRAFFIC INTO CLASSES\n";
+foreach $classentry (sort @classes)
+{
+       @classline = split( /\;/, $classentry );
+       if ($qossettings{'RED_DEV'} eq $classline[0]) {
+               $qossettings{'DEVICE'} = $classline[0];
+               $qossettings{'CLASS'} = $classline[1];
+               print "\ttc filter add dev $qossettings{'DEVICE'} parent 1:0 prio 0 protocol ip handle $qossettings{'CLASS'} fw flowid 1:$qossettings{'CLASS'}\n";
+       }
+}
 print <<END
 
+       ### 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
        iptables -t mangle -I POSTROUTING -o $qossettings{'RED_DEV'} -j QOS-OUT
@@ -196,28 +216,28 @@ print <<END
        iptables -t mangle -A QOS-OUT -m mark --mark 50 -j RETURN
 
        ### MARK ACKs
-       iptables -t mangle -A QOS-OUT -p tcp --tcp-flags SYN,RST SYN -j CLASSIFY --set-class 1:$qossettings{'ACK'}
+       iptables -t mangle -A QOS-OUT -p tcp --tcp-flags SYN,RST SYN -j MARK --set-mark $qossettings{'ACK'}
        iptables -t mangle -A QOS-OUT -p tcp --tcp-flags SYN,RST SYN -j RETURN
 
-       iptables -t mangle -A QOS-OUT -p icmp -m length --length 40:100 -j CLASSIFY --set-class 1:$qossettings{'ACK'}
+       iptables -t mangle -A QOS-OUT -p icmp -m length --length 40:100 -j MARK --set-mark $qossettings{'ACK'}
        iptables -t mangle -A QOS-OUT -p icmp -m length --length 40:100 -j RETURN
 
-       iptables -t mangle -A QOS-OUT -p tcp --syn -m length --length 40:68 -j CLASSIFY --set-class 1:$qossettings{'ACK'}
+       iptables -t mangle -A QOS-OUT -p tcp --syn -m length --length 40:68 -j MARK --set-mark $qossettings{'ACK'}
        iptables -t mangle -A QOS-OUT -p tcp --syn -m length --length 40:68 -j RETURN
 
-       iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL SYN,ACK -m length --length 40:68 -j CLASSIFY --set-class 1:$qossettings{'ACK'}
+       iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL SYN,ACK -m length --length 40:68 -j MARK --set-mark $qossettings{'ACK'}
        iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL SYN,ACK -m length --length 40:68 -j RETURN
 
-       iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL ACK -m length --length 40:100 -j CLASSIFY --set-class 1:$qossettings{'ACK'}
+       iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL ACK -m length --length 40:100 -j MARK --set-mark $qossettings{'ACK'}
        iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL ACK -m length --length 40:100 -j RETURN
 
-       iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL RST -j CLASSIFY --set-class 1:$qossettings{'ACK'}
+       iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL RST -j MARK --set-mark $qossettings{'ACK'}
        iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL RST -j RETURN
 
-       iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL ACK,RST -j CLASSIFY --set-class 1:$qossettings{'ACK'}
+       iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL ACK,RST -j MARK --set-mark $qossettings{'ACK'}
        iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL ACK,RST -j RETURN
 
-       iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL ACK,FIN -j CLASSIFY --set-class 1:$qossettings{'ACK'}
+       iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL ACK,FIN -j MARK --set-mark $qossettings{'ACK'}
        iptables -t mangle -A QOS-OUT -p tcp --tcp-flags ALL ACK,FIN -j RETURN
 
        ### SET TOS
@@ -230,7 +250,7 @@ END
                $qossettings{'TOS'} = abs $tosruleline[2] * 2;
                if ( $tosruleline[1] eq $qossettings{'RED_DEV'} )
                {
-                       print "\tiptables -t mangle -A QOS-OUT -m tos --tos $qossettings{'TOS'} -j CLASSIFY --set-class 1:$qossettings{'CLASS'}\n";
+                       print "\tiptables -t mangle -A QOS-OUT -m tos --tos $qossettings{'TOS'} -j MARK --set-mark $qossettings{'CLASS'}\n";
                        print "\tiptables -t mangle -A QOS-OUT -m tos --tos $qossettings{'TOS'} -j RETURN\n";
                }
        }
@@ -265,7 +285,7 @@ print "\n\t### SET PORT-RULES\n";
                        if ($qossettings{'DPORT'} ne ''){
                                print "--dport $qossettings{'DPORT'} ";
                        }
-                       print "-j CLASSIFY --set-class 1:$qossettings{'CLASS'}\n";
+                       print "-j MARK --set-mark $qossettings{'CLASS'}\n";
                        print "\tiptables -t mangle -A QOS-OUT ";
                        if ($qossettings{'QIP'} ne ''){
                                print "-s $qossettings{'QIP'} ";
@@ -286,6 +306,7 @@ print "\n\t### SET PORT-RULES\n";
                        print "-j RETURN\n\n";
                }
        }
+
 print <<END
 
        ### SET LEVEL7-RULES
@@ -308,7 +329,7 @@ END
                        if ($qossettings{'DIP'} ne ''){
                                print "-d $qossettings{'DIP'} ";
                        }
-                       print "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettings{'L7PROT'} -j CLASSIFY --set-class 1:$qossettings{'CLASS'}\n";
+                       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 ";
                        if ($qossettings{'QIP'} ne ''){
                                print "-s $qossettings{'QIP'} ";
@@ -323,7 +344,7 @@ END
 print <<END
 
        ### REDUNDANT: SET ALL NONMARKED PACKETS TO DEFAULT CLASS
-       iptables -t mangle -A QOS-OUT -j CLASSIFY --set-class 1:$qossettings{'DEFCLASS_OUT'}
+       iptables -t mangle -A QOS-OUT -m mark --mark 0 -j MARK --set-mark $qossettings{'DEFCLASS_OUT'}
 
        ###
        ### $qossettings{'IMQ_DEV'}
@@ -337,11 +358,10 @@ print <<END
                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 \\
+               action connmark \\
                action mirred egress redirect dev $qossettings{'IMQ_DEV'}
 
        ### ADD HTB QDISC FOR $qossettings{'IMQ_DEV'}
@@ -386,11 +406,24 @@ foreach $classentry (sort @classes)
                print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel $fqcodel_options\n";
        }
 }
+print "\n\t### FILTER TRAFFIC INTO CLASSES\n";
+foreach $classentry (sort @classes)
+{
+       @classline = split( /\;/, $classentry );
+       if ($qossettings{'IMQ_DEV'} eq $classline[0]) {
+               $qossettings{'DEVICE'} = $classline[0];
+               $qossettings{'CLASS'} = $classline[1];
+               print "\ttc filter add dev $qossettings{'DEVICE'} parent 2:0 prio 0 protocol ip handle $qossettings{'CLASS'} fw flowid 2:$qossettings{'CLASS'}\n";
+       }
+}
 print <<END
 
        ### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
        iptables -t mangle -N QOS-INC
-       iptables -t mangle -A FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC
+       iptables -t mangle -A PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC
+
+       # If the packet is already marked, then skip the processing
+       iptables -t mangle -A QOS-INC -m mark ! --mark 0 -j RETURN
 
        ### SET TOS
 END
@@ -402,8 +435,7 @@ END
                $qossettings{'TOS'} = abs $tosruleline[2] * 2;
                if ( $tosruleline[1] eq $qossettings{'IMQ_DEV'} )
                {
-                       print "\tiptables -t mangle -A QOS-INC -m tos --tos $qossettings{'TOS'} -j CLASSIFY --set-class 2:$qossettings{'CLASS'}\n";
-                       print "\tiptables -t mangle -A QOS-INC -m tos --tos $qossettings{'TOS'} -j RETURN\n";
+                       print "\tiptables -t mangle -A QOS-INC -m mark --mark 0 -m tos --tos $qossettings{'TOS'} -j MARK --set-mark $qossettings{'CLASS'}\n";
                }
 
        }
@@ -421,25 +453,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 ";
-                       if ($qossettings{'QIP'} ne ''){
-                               print "-s $qossettings{'QIP'} ";
-                       }
-                       if ($qossettings{'DIP'} ne ''){
-                               print "-d $qossettings{'DIP'} ";
-                       }
-                       print "-p $qossettings{'PPROT'} ";
-#                      if (($qossettings{'QPORT'} ne '') || ($qossettings{'DPORT'} ne '')){
-#                              print "-m multiport ";
-#                      }
-                       if ($qossettings{'QPORT'} ne ''){
-                               print "--sport $qossettings{'QPORT'} ";
-                       }
-                       if ($qossettings{'DPORT'} ne ''){
-                               print "--dport $qossettings{'DPORT'} ";
-                       }
-                       print "-j CLASSIFY --set-class 2:$qossettings{'CLASS'}\n";
-                       print "\tiptables -t mangle -A QOS-INC ";
+                       print "\tiptables -t mangle -A QOS-INC -m mark --mark 0 ";
                        if ($qossettings{'QIP'} ne ''){
                                print "-s $qossettings{'QIP'} ";
                        }
@@ -456,7 +470,7 @@ print "\n\t### SET PORT-RULES\n";
                        if ($qossettings{'DPORT'} ne ''){
                                print "--dport $qossettings{'DPORT'} ";
                        }
-                       print "-j RETURN\n\n";
+                       print "-j MARK --set-mark $qossettings{'CLASS'}\n";
                }
        }
 
@@ -475,28 +489,23 @@ END
                        $qossettings{'L7PROT'} = $l7ruleline[2];
                        $qossettings{'QIP'} = $l7ruleline[3];
                        $qossettings{'DIP'} = $l7ruleline[4];
-                       print "\tiptables -t mangle -A QOS-INC ";
+                       print "\tiptables -t mangle -A QOS-INC -m mark --mark 0 ";
                        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 CLASSIFY --set-class 2:$qossettings{'CLASS'}\n";
-                       print "\tiptables -t mangle -A QOS-INC ";
-                       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 "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettings{'L7PROT'} -j MARK --set-mark $qossettings{'CLASS'}\n";
                }
        }
 
 print <<END
        ### REDUNDANT: SET ALL NONMARKED PACKETS TO DEFAULT CLASS
-       iptables -t mangle -A QOS-INC -j CLASSIFY --set-class 2:$qossettings{'DEFCLASS_INC'}
+       iptables -t mangle -A QOS-INC -m mark --mark 0 -j MARK --set-mark $qossettings{'DEFCLASS_INC'}
+
+       # Save mark in connection tracking
+       iptables -t mangle -A QOS-INC -j CONNMARK --save-mark
 
        ## STARTING COLLECTOR
        /usr/local/bin/qosd $qossettings{'RED_DEV'} >/dev/null 2>&1
@@ -526,11 +535,13 @@ print <<END
 
        # REMOVE & FLUSH CHAINS
        iptables -t mangle --delete POSTROUTING -o $qossettings{'RED_DEV'} -j 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 PREROUTING -i $qossettings{'RED_DEV'} -j QOS-INC >/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
+       # remove l7-filter
+       iptables -t mangle --delete PREROUTING -m layer7 --l7proto unset
 
        rmmod sch_htb >/dev/null 2>&1