Re: [pmg-devel] [PATCH pmg-api 09/12] MailQueue: return maximum AID

[Stoiko Ivanov <s.ivanov@proxmox.com>]

LGTM

Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>

On Fri,  9 Feb 2024 13:54:33 +0100
Dominik Csapak <d.csapak@proxmox.com> wrote:

> we'll need this in the what_matches to invert mark lists.
> 
> Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
> ---
>  src/PMG/MailQueue.pm    | 4 ++--
>  src/PMG/Utils.pm        | 2 ++
>  src/bin/pmg-smtp-filter | 3 ++-
>  3 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/src/PMG/MailQueue.pm b/src/PMG/MailQueue.pm
> index 8355c30..4e37cb9 100644
> --- a/src/PMG/MailQueue.pm
> +++ b/src/PMG/MailQueue.pm
> @@ -406,10 +406,10 @@ sub parse_mail {
>      # we also remove all proxmox-marks from the mail and add an unique
>      # id to each attachment.
>  
> -    PMG::Utils::remove_marks ($entity, 1);
> +    my $max_aid = PMG::Utils::remove_marks ($entity, 1);
>      PMG::Utils::add_ct_marks ($entity);
>  
> -    return $entity;
> +    return ($entity, $max_aid);
>  }
>  
>  sub decode_entities {
> diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm
> index d9c9d2d..9f69e7f 100644
> --- a/src/PMG/Utils.pm
> +++ b/src/PMG/Utils.pm
> @@ -186,6 +186,8 @@ sub remove_marks {
>  
>  	$id++;
>      });
> +
> +    return $id - 1; # return max AID
>  }
>  
>  sub subst_values {
> diff --git a/src/bin/pmg-smtp-filter b/src/bin/pmg-smtp-filter
> index 71043b0..86d633d 100755
> --- a/src/bin/pmg-smtp-filter
> +++ b/src/bin/pmg-smtp-filter
> @@ -648,7 +648,8 @@ sub handle_smtp {
>  
>  	my $maxfiles = $pmg_cfg->get('clamav', 'archivemaxfiles');
>  
> -	my $entity = $queue->parse_mail($maxfiles);
> +	my ($entity, $max_aid) = $queue->parse_mail($maxfiles);
> +	$msginfo->{max_aid} = $max_aid;
>  
>  	$self->log (3, "$queue->{logid}: new mail message-id=%s", $queue->{msgid});
>