From nobody Wed Jun 14 04:01:16 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QgsDN3zFCz4dqMd for ; Wed, 14 Jun 2023 04:01:24 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from glebi.us (glebi.us [162.251.186.162]) by mx1.freebsd.org (Postfix) with ESMTP id 4QgsDM2n6Hz43DN; Wed, 14 Jun 2023 04:01:23 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 162.251.186.162 is neither permitted nor denied by domain of glebius@freebsd.org) smtp.mailfrom=glebius@freebsd.org; dmarc=none Received: by glebi.us (Postfix, from userid 1000) id 93F184531B; Tue, 13 Jun 2023 21:01:16 -0700 (PDT) Date: Tue, 13 Jun 2023 21:01:16 -0700 From: Gleb Smirnoff To: Joseph Mingrone , dev-commits-src-main@freebsd.org Subject: Re: git: 171a7bbfc048 - main - tcpdump: fix build with WITHOUT_PF=1 Message-ID: References: <202306140359.35E3x4fJ060841@gitrepo.freebsd.org> List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202306140359.35E3x4fJ060841@gitrepo.freebsd.org> X-Spamd-Result: default: False [0.51 / 15.00]; VIOLATED_DIRECT_SPF(3.50)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.993]; MIME_GOOD(-0.10)[text/plain]; RCVD_NO_TLS_LAST(0.10)[]; MLMMJ_DEST(0.00)[dev-commits-src-main@freebsd.org]; MIME_TRACE(0.00)[0:+]; R_DKIM_NA(0.00)[]; RCPT_COUNT_TWO(0.00)[2]; ASN(0.00)[asn:27348, ipnet:162.251.186.0/24, country:US]; FROM_EQ_ENVFROM(0.00)[]; ARC_NA(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[glebius]; RCVD_COUNT_TWO(0.00)[2]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MID_RHS_MATCH_FROM(0.00)[] X-Rspamd-Queue-Id: 4QgsDM2n6Hz43DN X-Spamd-Bar: / X-ThisMailContainsUnwantedMimeParts: N 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 T> AuthorDate: 2023-06-14 03:58:36 +0000 T> Commit: Gleb Smirnoff 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 -- Gleb Smirnoff