Re: git: 171a7bbfc048 - main - tcpdump: fix build with WITHOUT_PF=1

Hello Gleb,

Thanks for reporting.

https://reviews.freebsd.org/D40578

Joe

On Tue, 2023-06-13 at 21:01, Gleb Smirnoff <glebius@freebsd.org> wrote:

>   Joseph,

> I guess there is also regression with pfsync printing. Didn't check with
> real traffic, but:

> # grep pfsync_if_print *
> grep: cmake: Is a directory
> grep: doc: Is a directory
> grep: lbl: Is a directory
> grep: missing: Is a directory
> netdissect.h:extern u_int pfsync_if_print(netdissect_options *, const struct pcap_pkthdr *, const u_char *);
> print-pfsync.c:pfsync_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
> #

> Doesn't look used.

> On Wed, Jun 14, 2023 at 03:59:04AM +0000, Gleb Smirnoff wrote:
> T> The branch main has been updated by glebius:
> T> 
> T> URL: https://cgit.FreeBSD.org/src/commit/?id=171a7bbfc04885150401ab64d96793373a8b2061
> T> 
> T> commit 171a7bbfc04885150401ab64d96793373a8b2061
> T> Author:     Gleb Smirnoff <glebius@FreeBSD.org>
> T> AuthorDate: 2023-06-14 03:58:36 +0000
> T> Commit:     Gleb Smirnoff <glebius@FreeBSD.org>
> T> CommitDate: 2023-06-14 03:58:36 +0000
> T> 
> T>     tcpdump: fix build with WITHOUT_PF=1
> T>     
> T>     Fixes:  ee67461e56828dd1f8de165947ba83f6d9148a87
> T> ---
> T>  contrib/tcpdump/print.c | 2 +-
> T>  1 file changed, 1 insertion(+), 1 deletion(-)
> T> 
> T> diff --git a/contrib/tcpdump/print.c b/contrib/tcpdump/print.c
> T> index 9c0ab8622de1..42a4548e8689 100644
> T> --- a/contrib/tcpdump/print.c
> T> +++ b/contrib/tcpdump/print.c
> T> @@ -185,7 +185,7 @@ static const struct printer printers[] = {
> T>  #ifdef DLT_LOOP
> T>  	{ null_if_print,	DLT_LOOP },
> T>  #endif
> T> -#ifdef DLT_PFLOG
> T> +#if defined(DLT_PFLOG) && defined(HAVE_NET_IF_PFLOG_H)
> T>  	{ pflog_if_print,	DLT_PFLOG },
> T>  #endif
> T>  #ifdef DLT_PKTAP