From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 0D3AF1FF165 for ; Thu, 17 Jul 2025 16:14:48 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 114A33C1D6; Thu, 17 Jul 2025 16:15:43 +0200 (CEST) From: Christoph Heiss To: pve-devel@lists.proxmox.com Date: Thu, 17 Jul 2025 16:15:20 +0200 Message-ID: <20250717141530.1471199-5-c.heiss@proxmox.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250717141530.1471199-1-c.heiss@proxmox.com> References: <20250717141530.1471199-1-c.heiss@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1752761735999 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.031 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [helpers.pm] Subject: [pve-devel] [PATCH firewall v4 04/14] firewall: helpers: add sub for flushing conntrack entries by mark X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" A small helper routine for flushing all conntrack table entries which are marked with a specific value. Signed-off-by: Christoph Heiss --- Changes v1 -> v2: * no changes Changes v2 -> v3: * rebased on trixie Changes v3 -> v4: * rebased on latest master * added proper pod header debian/control | 3 ++- src/PVE/Firewall/Helpers.pm | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index d8ca975..a420016 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,8 @@ Standards-Version: 4.6.2 Package: pve-firewall Architecture: any Conflicts: ulogd, -Depends: ebtables, +Depends: conntrack, + ebtables, ipset, iptables, libpve-access-control, diff --git a/src/PVE/Firewall/Helpers.pm b/src/PVE/Firewall/Helpers.pm index 49e2a3d..fa3646c 100644 --- a/src/PVE/Firewall/Helpers.pm +++ b/src/PVE/Firewall/Helpers.pm @@ -17,6 +17,7 @@ our @EXPORT_OK = qw( remove_vmfw_conf clone_vmfw_conf collect_refs + flush_fw_ct_entries_by_mark ); my $pvefw_conf_dir = "/etc/pve/firewall"; @@ -198,6 +199,7 @@ Checks whether nftables is active via checking for the existence of the file C<$FORCE_NFT_DISABLE_FLAG_FILE> =cut + sub is_nftables { return !-e $FORCE_NFT_DISABLE_FLAG_FILE; } @@ -209,9 +211,27 @@ firewall bridge in order for the current firewall configuration to work. This is the case when using pve-firewall (iptables) or bridges that use OVS. =cut + sub needs_fwbr { my ($bridge_name) = @_; return !is_nftables() || PVE::Network::is_ovs_bridge($bridge_name); } +=head3 flush_fw_ct_entries_by_mark($mark) + +Flushes all conntrack table entries which are CONNMARK'd with the given +value in C<$mark>. + +=cut + +sub flush_fw_ct_entries_by_mark { + my ($mark) = @_; + + PVE::Tools::run_command( + ['conntrack', '--delete', '--mark', $mark], + noerr => 1, + quiet => 1, + ); +} + 1; -- 2.49.0 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel