From mboxrd@z Thu Jan  1 00:00:00 1970
From: Arne Fitzenreiter <git@ipfire.org>
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 819fdfb17a3cbc7c25ce098be83896bcd3311567
Date: Mon, 18 Oct 2021 13:33:55 +0000
Message-ID: <4HXyWl32hLz2yKX@people01.haj.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5838447191267576042=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============5838447191267576042==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  819fdfb17a3cbc7c25ce098be83896bcd3311567 (commit)
      from  03c7877845a147029fa122f35ea5a1a3289aacf6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 819fdfb17a3cbc7c25ce098be83896bcd3311567
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Mon Oct 18 14:44:59 2021 +0200

    QoS: imgress Connmark restore, layer7 and IPSec handling
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/qos/makeqosscripts.pl | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

Difference in files:
diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl
index bf5b5e0ae..b029a885f 100644
--- a/config/qos/makeqosscripts.pl
+++ b/config/qos/makeqosscripts.pl
@@ -289,7 +289,7 @@ END
 			$qossettings{'L7PROT'} =3D $l7ruleline[2];
 			$qossettings{'QIP'} =3D $l7ruleline[3];
 			$qossettings{'DIP'} =3D $l7ruleline[4];
-  			print "\tiptables -t mangle -A QOS-OUT ";
+			print "\tiptables -t mangle -A QOS-OUT -m mark --mark 0/$QOS_OUT_MASK ";
 			if ($qossettings{'QIP'} ne ''){
 				print "-s $qossettings{'QIP'} ";
 			}
@@ -297,24 +297,16 @@ END
 				print "-d $qossettings{'DIP'} ";
 			}
 			print "-m layer7 --l7dir /etc/l7-protocols/protocols --l7proto $qossettin=
gs{'L7PROT'} -j MARK --set-xmark " . ($qossettings{'CLASS'} << $QOS_OUT_SHIFT=
) . "/$QOS_OUT_MASK\n";
-  			print "\tiptables -t mangle -A QOS-OUT ";
-			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 $qossettin=
gs{'L7PROT'} -j RETURN\n";
   		}
   	}
=20
 print <<END
=20
 	### REDUNDANT: SET ALL NONMARKED PACKETS TO DEFAULT CLASS
-	iptables -t mangle -A QOS-OUT -m mark --mark 0/$QOS_OUT_MASK -j MARK --set-=
xmark $DEF_OUT_MARK
+	iptables -t mangle -A QOS-OUT -m mark --mark 0/$QOS_OUT_MASK -m layer7 ! --=
l7proto unset -j MARK --set-xmark $DEF_OUT_MARK
=20
 	# Save mark in connection tracking
-	iptables -t mangle -A QOS-OUT -m mark ! --mark 0/$QOS_OUT_MASK -j CONNMARK =
--save-mark
+	iptables -t mangle -A QOS-OUT -m mark ! --mark 0/$QOS_OUT_MASK -j CONNMARK =
--save-mark --mask $QOS_OUT_MASK
=20
 	###
 	### $qossettings{'IMQ_DEV'}
@@ -330,7 +322,13 @@ print <<END
=20
 	ip link set $qossettings{'IMQ_DEV'} up
=20
-	tc filter add dev $qossettings{'RED_DEV'} parent ffff: protocol all u32 mat=
ch u32 0 0 \\
+	### Restore conmark and continue with next filter
+	tc filter add dev $qossettings{'RED_DEV'} parent ffff: prio 1 protocol all =
u32 \\
+		match u32 0 0 \\
+		action connmark continue
+	### Send all traffic except IPSec to $qossettings{'IMQ_DEV'}
+	tc filter add dev $qossettings{'RED_DEV'} parent ffff: prio 2 protocol all =
u32 \\
+		match mark 0 $IPSEC_MASK \\
 		action mirred egress redirect dev $qossettings{'IMQ_DEV'}
=20
 	### ADD HTB QDISC FOR $qossettings{'IMQ_DEV'}
@@ -475,7 +473,7 @@ print <<END
 	iptables -t mangle -A QOS-INC -m mark --mark 0/$QOS_INC_MASK -m layer7 ! --=
l7proto unset -j MARK --set-xmark $DEF_INC_MARK
=20
 	# Save mark in connection tracking
-	iptables -t mangle -A QOS-INC -m mark ! --mark 0/$QOS_INC_MASK -j CONNMARK =
--save-mark
+	iptables -t mangle -A QOS-INC -m mark ! --mark 0/$QOS_INC_MASK -j CONNMARK =
--save-mark --mask $QOS_INC_MASK
=20
 	## STARTING COLLECTOR
 	/usr/local/bin/qosd $qossettings{'RED_DEV'} >/dev/null 2>&1


hooks/post-receive
--
IPFire 2.x development tree

--===============5838447191267576042==--