From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 9898F799A8 for ; Wed, 27 Oct 2021 13:30:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8F3BB123D8 for ; Wed, 27 Oct 2021 13:30:04 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS id DD7F2123CA for ; Wed, 27 Oct 2021 13:30:03 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A7BEE45FAF; Wed, 27 Oct 2021 13:30:03 +0200 (CEST) Message-ID: <599e3243-5ecd-2267-e022-b589ec1c06aa@proxmox.com> Date: Wed, 27 Oct 2021 13:30:01 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:94.0) Gecko/20100101 Thunderbird/94.0 Content-Language: en-GB To: Proxmox VE development discussion , Mark Yardley References: <20211018202132.4072-1-mgit@fragmentedpackets.net> <20211018202132.4072-2-mgit@fragmentedpackets.net> From: Thomas Lamprecht In-Reply-To: <20211018202132.4072-2-mgit@fragmentedpackets.net> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.287 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 NICE_REPLY_A -0.215 Looks like a legit reply (A) 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. [proxmox.com, firewall.pm] Subject: Re: [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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Oct 2021 11:30:04 -0000 On 18/10/2021 22:21, Mark Yardley wrote: > Signed-off-by: Mark Yardley > --- > 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 > much thanks for the patch, it looks OK. For being able to apply it we'd need a signed CLA sent to , see the wiki for details https://pve.proxmox.com/wiki/Developer_Documentation#Software_License_and_Copyright cheers, Thomas