From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH v2 10/15] QoS: Use CONNMARK to mark connections in connection tracking
Date: Mon, 21 Oct 2019 20:45:34 +0200 [thread overview]
Message-ID: <20191021184539.12758-10-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20191021184539.12758-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 4314 bytes --]
From: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
This patch modifies the connection tracking in that ways that
it sets a connection mark which will be retrieved when a packet
is being redirected to the IFB interface.
This way, we can use classification without having the packet
being sent through iptables first.
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Daniel Weismüller <daniel.weismueller(a)ipfire.org>
---
config/qos/makeqosscripts.pl | 40 ++++++++++------------------------------
1 file changed, 10 insertions(+), 30 deletions(-)
diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index 51d818699..1754c45fd 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -371,6 +371,7 @@ print <<END
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'}
@@ -435,6 +436,9 @@ print <<END
iptables -t mangle -I FORWARD -i $qossettings{'RED_DEV'} -j QOS-INC
iptables -t mangle -A FORWARD -i $qossettings{'RED_DEV'} -j QOS-TOS
+ # 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
;
@@ -445,8 +449,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 MARK --set-mark $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";
}
}
@@ -464,7 +467,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 ";
+ print "\tiptables -t mangle -A QOS-INC -m mark --mark 0 ";
if ($qossettings{'QIP'} ne ''){
print "-s $qossettings{'QIP'} ";
}
@@ -482,24 +485,6 @@ 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 ";
- 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 RETURN\n\n";
}
}
@@ -518,7 +503,7 @@ 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'} ";
}
@@ -526,14 +511,6 @@ END
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 ";
- 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";
}
}
@@ -541,6 +518,9 @@ 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'}
+ # Save mark in connection tracking
+ iptables -t mangle -A QOS-INC -j CONNMARK --save-mark
+
### SETTING TOS BITS
END
;
--
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 ` [PATCH v2 09/15] Revert "Make IMQ Switchable between PREROUTING and POSTROUTING" Michael Tremer
2019-10-21 18:45 ` Michael Tremer [this message]
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-10-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