From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Mark Yardley <mgit@fragmentedpackets.net>
Subject: Re: [pve-devel] [PATCH firewall 1/1] fix #3677 ipset_get_chains fixed to work with new ipset output
Date: Wed, 27 Oct 2021 13:30:01 +0200 [thread overview]
Message-ID: <599e3243-5ecd-2267-e022-b589ec1c06aa@proxmox.com> (raw)
In-Reply-To: <20211018202132.4072-2-mgit@fragmentedpackets.net>
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
next prev parent reply other threads:[~2021-10-27 11:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-18 20:21 [pve-devel] [PATCH firewall 0/1] " Mark Yardley
2021-10-18 20:21 ` [pve-devel] [PATCH firewall 1/1] " Mark Yardley
2021-10-27 11:30 ` Thomas Lamprecht [this message]
2021-10-27 13:48 ` Mark Yardley
2021-10-29 18:09 ` [pve-devel] applied + follow up: [PATCH] fix #3677: follow up: actually handle bucket size and ignore initval Thomas Lamprecht
2021-10-21 7:04 ` [pve-devel] [PATCH firewall 0/1] fix #3677 ipset_get_chains fixed to work with new ipset output DERUMIER, Alexandre
2021-10-25 14:43 ` DERUMIER, Alexandre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=599e3243-5ecd-2267-e022-b589ec1c06aa@proxmox.com \
--to=t.lamprecht@proxmox.com \
--cc=mgit@fragmentedpackets.net \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.