From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <mgit@fragmentedpackets.net>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id D08E47650F
for <pve-devel@lists.proxmox.com>; Mon, 18 Oct 2021 22:22:19 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id C844825B8D
for <pve-devel@lists.proxmox.com>; Mon, 18 Oct 2021 22:21:49 +0200 (CEST)
Received: from luna.fragmentedpackets.net (luna.fragmentedpackets.net
[IPv6:2001:4d48:4604:cafe::1337])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256)
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id 6A11325B85
for <pve-devel@lists.proxmox.com>; Mon, 18 Oct 2021 22:21:49 +0200 (CEST)
Received: from SHED-X.fragmentedpackets.net
(cpc116982-telf14-2-0-cust426.16-1.cable.virginm.net [86.28.27.171])
by luna.fragmentedpackets.net (Postfix) with ESMTPSA id 0B2C741A5A;
Mon, 18 Oct 2021 21:21:49 +0100 (BST)
From: Mark Yardley <mgit@fragmentedpackets.net>
To: pve-devel@lists.proxmox.com
Date: Mon, 18 Oct 2021 21:21:32 +0100
Message-Id: <20211018202132.4072-2-mgit@fragmentedpackets.net>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20211018202132.4072-1-mgit@fragmentedpackets.net>
References: <20211018202132.4072-1-mgit@fragmentedpackets.net>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.000 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
Subject: [pve-devel] [PATCH firewall 1/1] fix #3677 ipset_get_chains fixed
to work with new ipset output
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Mon, 18 Oct 2021 20:22:19 -0000
Signed-off-by: Mark Yardley <mgit@fragmentedpackets.net>
---
src/PVE/Firewall.pm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/PVE/Firewall.pm b/src/PVE/Firewall.pm
index edc5336..6b9b787 100644
--- a/src/PVE/Firewall.pm
+++ b/src/PVE/Firewall.pm
@@ -1948,6 +1948,10 @@ sub ipset_get_chains {
if ($line =~ m/^(?:\S+)\s(PVEFW-\S+)\s(?:\S+).*/) {
my $chain = $1;
$line =~ s/\s+$//; # delete trailing white space
+ # ignore bucketsize onwards from output of ipset v7+
+ if ($line =~ m/^(.*?)(?:\sbucketsize.*)/) {
+ $line = $1;
+ }
push @{$chains->{$chain}}, $line;
} else {
# simply ignore the rest
--
2.33.0