Re: [pve-devel] [PATCH firewall 1/1] fix #3677 ipset_get_chains fixed to work with new ipset output

[Mark Yardley <mgit@fragmentedpackets.net>]

On 27/10/2021 12:30, Thomas Lamprecht wrote:
> On 18/10/2021 22:21, Mark Yardley wrote:
>> 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
>>
> 
> much thanks for the patch, it looks OK. For being able to apply it we'd need a
> signed CLA sent to <office@proxmox.com>, see the wiki for details
> 
> https://pve.proxmox.com/wiki/Developer_Documentation#Software_License_and_Copyright
> 
> cheers,
> Thomas
> 
> 

Hi Thomas, CLA has now been sent over as requested.

Regards,
Mark