Re: [PATCH 2/4] pcap: Add an offset argument in pcap_iov()

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 2021 bytes --]

On Tue, Sep 24, 2024 at 05:46:40PM +0200, Laurent Vivier wrote:
> The offset is passed directly to pcap_frame() and allows
> any headers that are not part of the frame to
> capture to be skipped.
> 
> Signed-off-by: Laurent Vivier <lvivier@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  pcap.c | 5 +++--
>  pcap.h | 2 +-
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/pcap.c b/pcap.c
> index e6b5ced4a9f8..6ee6cdfd261a 100644
> --- a/pcap.c
> +++ b/pcap.c
> @@ -138,9 +138,10 @@ void pcap_multiple(const struct iovec *iov, size_t frame_parts, unsigned int n,
>   * @iov:	Pointer to the array of struct iovec describing the I/O vector
>   *		containing packet data to write, including L2 header
>   * @iovcnt:	Number of buffers (@iov entries)
> + * @offset:	Offset of the L2 frame within the full data length
>   */
>  /* cppcheck-suppress unusedFunction */
> -void pcap_iov(const struct iovec *iov, size_t iovcnt)
> +void pcap_iov(const struct iovec *iov, size_t iovcnt, size_t offset)
>  {
>  	struct timespec now;
>  
> @@ -148,7 +149,7 @@ void pcap_iov(const struct iovec *iov, size_t iovcnt)
>  		return;
>  
>  	clock_gettime(CLOCK_REALTIME, &now);
> -	pcap_frame(iov, iovcnt, 0, &now);
> +	pcap_frame(iov, iovcnt, offset, &now);
>  }
>  
>  /**
> diff --git a/pcap.h b/pcap.h
> index 533923749222..9795f2e8adc5 100644
> --- a/pcap.h
> +++ b/pcap.h
> @@ -9,7 +9,7 @@
>  void pcap(const char *pkt, size_t l2len);
>  void pcap_multiple(const struct iovec *iov, size_t frame_parts, unsigned int n,
>  		   size_t offset);
> -void pcap_iov(const struct iovec *iov, size_t iovcnt);
> +void pcap_iov(const struct iovec *iov, size_t iovcnt, size_t offset);
>  void pcap_init(struct ctx *c);
>  
>  #endif /* PCAP_H */

-- 
David Gibson (he or they)	| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you, not the other way
				| around.
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]