From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH v2 09/15] Revert "Make IMQ Switchable between PREROUTING and POSTROUTING"
Date: Mon, 21 Oct 2019 20:45:33 +0200 [thread overview]
Message-ID: <20191021184539.12758-9-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20191021184539.12758-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 2740 bytes --]
This reverts commit 88b8ffac6b258e7b7687eb26111134bf435e23ca.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
config/qos/makeqosscripts.pl | 28 ++--------------------------
1 file changed, 2 insertions(+), 26 deletions(-)
diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index 2b5cce84f..51d818699 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -71,7 +71,6 @@ $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);
@@ -426,9 +425,6 @@ foreach $classentry (sort @classes)
print "\ttc filter add dev $qossettings{'DEVICE'} parent 2:0 prio 0 protocol ip handle $qossettings{'CLASS'} fw flowid 2:$qossettings{'CLASS'}\n";
}
}
-
-if ( $qossettings{'IMQ_MODE'} eq 'POSTROUTING' )
-{
print <<END
### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
@@ -442,24 +438,6 @@ print <<END
### SET TOS
END
;
-}
-else
-{
-print <<END
-
- ### ADD QOS-INC CHAIN TO THE MANGLE TABLE IN IPTABLES
- iptables -t mangle -N QOS-INC
- 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 -I 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 );
@@ -616,10 +594,8 @@ print <<END
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 --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC
+ iptables -t mangle --delete FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS
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
--
2.12.2
next prev parent reply other threads:[~2019-10-21 18:45 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-21 18:45 [PATCH v2 01/15] QoS: Do not manually load iptables modules Michael Tremer
2019-10-21 18:45 ` [PATCH v2 02/15] QoS: Use Intermediate Functional Block Michael Tremer
2019-10-21 18:45 ` [PATCH v2 03/15] QoS: Tidy up qdiscs after QoS is being stopped Michael Tremer
2019-10-21 18:45 ` [PATCH v2 04/15] QoS: Start qosd immediately Michael Tremer
2019-10-21 18:45 ` [PATCH v2 05/15] QoS: Do not delete egress qdisc after classes have been created Michael Tremer
2019-10-21 18:45 ` [PATCH v2 06/15] linux+iptables: Drop support for IMQ Michael Tremer
2019-10-21 18:45 ` [PATCH v2 07/15] QoS: Suppress an error message when cleaning up from previous runs Michael Tremer
2019-10-21 18:45 ` [PATCH v2 08/15] QoS: Drop support for subclasses Michael Tremer
2019-10-21 18:45 ` Michael Tremer [this message]
2019-10-21 18:45 ` [PATCH v2 10/15] QoS: Use CONNMARK to mark connections in connection tracking Michael Tremer
2019-10-21 18:45 ` [PATCH v2 11/15] QoS: Classify incoming traffic in PREROUTING Michael Tremer
2019-10-21 18:45 ` [PATCH v2 12/15] QoS: Remove some IPsec rules which never worked Michael Tremer
2019-10-21 18:45 ` [PATCH v2 13/15] QoS: Drop support for setting TOS bits per class Michael Tremer
2019-10-21 18:45 ` [PATCH v2 14/15] QoS: No longer set TOS bits for ACK packets Michael Tremer
2019-10-21 18:45 ` [PATCH v2 15/15] QoS: Delete more unused iptables commands 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=20191021184539.12758-9-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