diff options
| author | Luiz Souza <luiz@netgate.com> | 2017-07-12 12:03:26 -0500 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2017-07-12 12:03:26 -0500 |
| commit | 3df95bffa4cbfeaae97e1497edef7a4775a868a4 (patch) | |
| tree | 69f1136337d2c9e32595ee25d1a8648379843e22 | |
| parent | 5fa580e9c45b6668f134701651fa17cad722750e (diff) | |
| download | FreeBSD-src-3df95bffa4cbfeaae97e1497edef7a4775a868a4.zip FreeBSD-src-3df95bffa4cbfeaae97e1497edef7a4775a868a4.tar.gz | |
Fix a few bugs in the commit 01a697b38d55406857d04f6b92d9aaf15e492384
Importing pfSense patch tcpdump.pfsync.diff
| -rw-r--r-- | contrib/tcpdump/netdissect.h | 2 | ||||
| -rw-r--r-- | contrib/tcpdump/print-pfsync.c | 5 | ||||
| -rw-r--r-- | contrib/tcpdump/print.c | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/contrib/tcpdump/netdissect.h b/contrib/tcpdump/netdissect.h index 5b043c8..d691ad1 100644 --- a/contrib/tcpdump/netdissect.h +++ b/contrib/tcpdump/netdissect.h @@ -434,6 +434,7 @@ extern u_int netanalyzer_transparent_if_print IF_PRINTER_ARGS; extern u_int nflog_if_print IF_PRINTER_ARGS; extern u_int null_if_print IF_PRINTER_ARGS; extern u_int pflog_if_print IF_PRINTER_ARGS; +extern u_int pfsync_if_print IF_PRINTER_ARGS; extern u_int pktap_if_print IF_PRINTER_ARGS; extern u_int ppi_if_print IF_PRINTER_ARGS; extern u_int ppp_bsdos_if_print IF_PRINTER_ARGS; @@ -576,7 +577,6 @@ extern int ospf_print_grace_lsa(netdissect_options *, const uint8_t *, u_int); extern int ospf_print_te_lsa(netdissect_options *, const uint8_t *, 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 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 605f3c1..9159ad2 100644 --- a/contrib/tcpdump/print-pfsync.c +++ b/contrib/tcpdump/print-pfsync.c @@ -74,9 +74,8 @@ pfsync_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, p + sizeof(struct pfsync_header), caplen - sizeof(struct pfsync_header)); out: - if (xflag) { - default_print((const u_char *)p, caplen); - } + if (!ndo->ndo_suppress_default_print) + ND_DEFAULTPRINT(p, caplen); safeputchar(ndo, '\n'); return (caplen); } diff --git a/contrib/tcpdump/print.c b/contrib/tcpdump/print.c index 385fbd5..0e8a509 100644 --- a/contrib/tcpdump/print.c +++ b/contrib/tcpdump/print.c @@ -128,7 +128,7 @@ static const struct printer printers[] = { { sll_if_print, DLT_LINUX_SLL }, #endif #if defined(DLT_PFSYNC) && defined(HAVE_NET_PFVAR_H) - { pfsync_if_print, DLT_PFSYNC}, + { pfsync_if_print, DLT_PFSYNC }, #endif #ifdef DLT_FR { fr_if_print, DLT_FR }, |
