From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 13/17] QoS: Drop tc filter rules to move marked packets into the correct class
Date: Mon, 14 Oct 2019 16:46:23 +0000 [thread overview]
Message-ID: <20191014164627.18516-13-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20191014164627.18516-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 3432 bytes --]
This is no longer necessary since we are now using CLASSIFY
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/qos/makeqosscripts.pl | 47 +-----------------------------------
1 file changed, 1 insertion(+), 46 deletions(-)
diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index 7d680151b..f73fe2938 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -131,12 +131,6 @@ 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
@@ -147,7 +141,6 @@ case "\$1" in
esac
\$0 \$1 qdisc
\$0 \$1 class
- \$0 \$1 filter
\$0 \$1 iptables
exit 0
;;
@@ -230,25 +223,6 @@ foreach $subclassentry (sort @subclasses) {
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)
-{
- @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";
- }
-}
-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 QOS-OUT CHAIN TO THE MANGLE TABLE IN IPTABLES
@@ -358,7 +332,6 @@ print "\n\t### SET PORT-RULES\n";
print "-j RETURN\n\n";
}
}
-
print <<END
### SET LEVEL7-RULES
@@ -488,25 +461,7 @@ foreach $subclassentry (sort @subclasses) {
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)
-{
- @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";
- }
-}
-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";
- }
-}
+
print <<END
### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
--
2.20.1
next prev parent reply other threads:[~2019-10-14 16:46 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-14 16:46 [PATCH 01/17] QoS: Do not manually load iptables modules Michael Tremer
2019-10-14 16:46 ` [PATCH 02/17] QoS: Use Intermediate Functional Block Michael Tremer
2019-10-14 16:46 ` [PATCH 03/17] Revert "Make IMQ Switchable between PREROUTING and POSTROUTING" Michael Tremer
2019-10-14 16:46 ` [PATCH 04/17] QoS: Tidy up qdiscs after QoS is being stopped Michael Tremer
2019-10-14 16:46 ` [PATCH 05/17] QoS: Process incoming packets in PREROUTING only Michael Tremer
2019-10-14 16:46 ` [PATCH 06/17] QoS: Silence RRD tool warnings Michael Tremer
2019-10-14 16:46 ` [PATCH 07/17] QoS: Start qosd immediately Michael Tremer
2019-10-14 16:46 ` [PATCH 08/17] QoS: Do not delete egress qdisc after classes have been created Michael Tremer
2019-10-14 16:46 ` [PATCH 09/17] linux+iptables: Drop support for IMQ Michael Tremer
2019-10-14 16:46 ` [PATCH 10/17] QoS: Suppress an error message when cleaning up from previous runs Michael Tremer
2019-10-14 16:46 ` [PATCH 11/17] QoS: Move packet classification to FORWARD chain for ingress Michael Tremer
2019-10-14 16:46 ` [PATCH 12/17] QoS: Use CLASSIFY iptables target instead of MARK Michael Tremer
2019-10-14 16:46 ` Michael Tremer [this message]
2019-10-14 16:46 ` [PATCH 14/17] QoS: Drop support for subclasses Michael Tremer
2019-10-14 16:46 ` [PATCH 15/17] QoS: Drop support for setting TOS bits per class Michael Tremer
2019-10-14 16:46 ` [PATCH 16/17] QoS: No longer set TOS bits for ACK packets Michael Tremer
2019-10-14 16:46 ` [PATCH 17/17] QoS: Increase queue size and quantum for fq_codel Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191014164627.18516-13-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox