git: 1ad8d2ee1f7d - main - tcpdump: Reconnect pfsync printer

The branch main has been updated by jrm:

URL: https://cgit.FreeBSD.org/src/commit/?id=1ad8d2ee1f7dec1d747ec955a68fbbb362958315

commit 1ad8d2ee1f7dec1d747ec955a68fbbb362958315
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2023-06-16 13:40:00 +0000
Commit:     Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2023-06-17 10:05:58 +0000

    tcpdump: Reconnect pfsync printer
    
    Fixes:  ee67461e (tpcdump: Update to 4.99.4)
    
    Reported by:    glebius
    Reviewed by:    kp
    Differential Revision:  https://reviews.freebsd.org/D40578
---
 contrib/tcpdump/netdissect.h   | 2 +-
 contrib/tcpdump/print-pfsync.c | 4 ++--
 contrib/tcpdump/print.c        | 3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/contrib/tcpdump/netdissect.h b/contrib/tcpdump/netdissect.h
index a4b05b557616..7696c4e41cd8 100644
--- a/contrib/tcpdump/netdissect.h
+++ b/contrib/tcpdump/netdissect.h
@@ -698,7 +698,7 @@ extern int ospf_grace_lsa_print(netdissect_options *, const u_char *, u_int);
 extern int ospf_te_lsa_print(netdissect_options *, const u_char *, u_int);
 extern void otv_print(netdissect_options *, const u_char *, u_int);
 extern void pfsync_ip_print(netdissect_options *, const u_char *, u_int);
-extern u_int pfsync_if_print(netdissect_options *, const struct pcap_pkthdr *, const u_char *);
+extern void pfsync_if_print(netdissect_options *, const struct pcap_pkthdr *, const u_char *);
 extern void pgm_print(netdissect_options *, const u_char *, u_int, const u_char *);
 extern void pim_print(netdissect_options *, const u_char *, u_int, const u_char *);
 extern void pimv1_print(netdissect_options *, const u_char *, u_int);
diff --git a/contrib/tcpdump/print-pfsync.c b/contrib/tcpdump/print-pfsync.c
index 83670481d40f..5710e36ded6c 100644
--- a/contrib/tcpdump/print-pfsync.c
+++ b/contrib/tcpdump/print-pfsync.c
@@ -57,7 +57,7 @@ static void	print_src_dst(netdissect_options *,
 		    const struct pfsync_state_peer *, uint8_t);
 static void	print_state(netdissect_options *, union pfsync_state_union *, int);
 
-u_int
+void
 pfsync_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
     register const u_char *p)
 {
@@ -78,7 +78,7 @@ out:
 		hex_print(ndo, "\n\t", p, caplen);
 	}
 	fn_print_char(ndo, '\n');
-	return (caplen);
+	return;
 }
 
 void
diff --git a/contrib/tcpdump/print.c b/contrib/tcpdump/print.c
index 42a4548e8689..41a6b524fbf8 100644
--- a/contrib/tcpdump/print.c
+++ b/contrib/tcpdump/print.c
@@ -188,6 +188,9 @@ static const struct printer printers[] = {
 #if defined(DLT_PFLOG) && defined(HAVE_NET_IF_PFLOG_H)
 	{ pflog_if_print,	DLT_PFLOG },
 #endif
+#if defined(DLT_PFSYNC) && defined(HAVE_NET_PFVAR_H)
+	{ pfsync_if_print,	DLT_PFSYNC},
+#endif
 #ifdef DLT_PKTAP
 	{ pktap_if_print,	DLT_PKTAP },
 #endif