From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 8A0A81FF165 for ; Thu, 25 Sep 2025 18:12:24 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 79F8625D06; Thu, 25 Sep 2025 18:12:54 +0200 (CEST) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Thu, 25 Sep 2025 18:12:45 +0200 Message-ID: <20250925161250.436548-2-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20250925161250.436548-1-s.hanreich@proxmox.com> References: <20250925161250.436548-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.182 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods 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. RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pve-devel] [PATCH proxmox-firewall 1/3] nftables: add support for auto-merge set option 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" nftables sets do not support overlapping ranges in ipsets with the interval flag enabled, unless explicitly enabled via auto-merge. This option has not yet been exposed by proxmox-nftables, so add it to the library. This requires at least nftables 1.1.0 to work, which is available since Debian trixie. Signed-off-by: Stefan Hanreich --- proxmox-nftables/src/types.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/proxmox-nftables/src/types.rs b/proxmox-nftables/src/types.rs index c613e64..c146d9c 100644 --- a/proxmox-nftables/src/types.rs +++ b/proxmox-nftables/src/types.rs @@ -500,6 +500,9 @@ pub struct SetConfig { #[serde(skip_serializing_if = "Option::is_none")] size: Option, + + #[serde(skip_serializing_if = "Option::is_none")] + auto_merge: Option, } impl SetConfig { @@ -512,6 +515,7 @@ impl SetConfig { timeout: None, gc_interval: None, size: None, + auto_merge: None, } } @@ -523,6 +527,11 @@ impl SetConfig { self.flags.push(flag); self } + + pub fn with_auto_merge(mut self, auto_merge: bool) -> Self { + self.auto_merge = Some(auto_merge); + self + } } #[derive(Clone, Debug, Deserialize, Serialize)] -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel