From patchwork Mon Oct 4 17:52:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 4763 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4HNSxB6bnBz3xCR for ; Mon, 4 Oct 2021 17:53:02 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4HNSx24dszz6qF; Mon, 4 Oct 2021 17:52:54 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4HNSx14PzKz32KQ; Mon, 4 Oct 2021 17:52:53 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4HNSx03Jrjz2yZk for ; Mon, 4 Oct 2021 17:52:52 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4HNSx01yJ4z188; Mon, 4 Oct 2021 17:52:52 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1633369972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mLXfD+gxQ5J8SYLvPioQaajteietkHsh7mjbmr8Nt1w=; b=l3fvSLld+1LaUHwmysonA8ZZaxCoYfHTrVcQH5gNt2qvhgK/ynzwOtaV0uFE3XwqhTg7A0 c8r/PxWrluYLgoBg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1633369972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mLXfD+gxQ5J8SYLvPioQaajteietkHsh7mjbmr8Nt1w=; b=tOaThF1Kz07PC7xLhpDepCAOXBZnFzN0QM7Vq0uJ/v/hCapU6V6YVIXn2+ocDv09m7DqDL itKFdI2fCieX7MwuK4MO1U5LxsU6o5W7eKhgcWhZbzuqGxab/Mr/LNEbPFFcEiyYAvRQ7U 6ZG0HLxvmOQBA/uz0+dkItSNdgUZxLmSw5Y18qqDf0YOpnf72Ox/PQFNYepxfI8Ypd/8wI 8qLalVymZB80Cc3CvbHXvDu87QF3/AyFAXdAQfzHmDHsTjii+LyUEuED+dUY+xilcYbLBp 5bj+uWerVdhWTfNND7TeSWQrbg98THRIlTRY4hmwbo6JbFiWUdUtwMzxv/XprQ== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 6/6] IPsec: Replace MARK 50 by 0x00800000 Date: Mon, 4 Oct 2021 18:52:22 +0100 Message-Id: <20211004175222.9208-6-michael.tremer@ipfire.org> In-Reply-To: <20211004175222.9208-1-michael.tremer@ipfire.org> References: <20211004175222.9208-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" This change is necessary because we are using the right-hand two bytes for storing the QoS classes. All IPsec traffic will now be skipped and never classified by the QoS. Signed-off-by: Michael Tremer --- config/qos/makeqosscripts.pl | 10 +++++----- src/initscripts/system/firewall | 7 +++++-- src/patches/strongswan-ipfire.patch | 12 ++++++------ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/config/qos/makeqosscripts.pl b/config/qos/makeqosscripts.pl index b1bb637b3..fc8b8b84f 100644 --- a/config/qos/makeqosscripts.pl +++ b/config/qos/makeqosscripts.pl @@ -61,6 +61,9 @@ my $QOS_INC_MASK = 0x0000ff00; my $QOS_INC_SHIFT = 8; my $QOS_OUT_MASK = 0x000000ff; my $QOS_OUT_SHIFT = 0; +my $IPSEC_MASK = 0x00800000; +my $QOS_INC_SKIP_MASK = $QOS_INC_MASK | $IPSEC_MASK; +my $QOS_OUT_SKIP_MASK = $QOS_OUT_MASK | $IPSEC_MASK; &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); @@ -220,10 +223,7 @@ print <