diff options
| author | Renato Botelho <renato@netgate.com> | 2017-02-10 06:50:40 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2017-02-10 07:04:31 -0200 |
| commit | 9c520da80579466ed328970249f2a9ea5cb61063 (patch) | |
| tree | cae1314b22411524c57918912ee468b8c9505c35 /contrib | |
| parent | 5c1daa5ea1098b67d4c331d5e21b39178d616031 (diff) | |
| download | FreeBSD-src-9c520da80579466ed328970249f2a9ea5cb61063.zip FreeBSD-src-9c520da80579466ed328970249f2a9ea5cb61063.tar.gz | |
Revert "Importing pfSense patch tcpdump.pfsync.diff"
This reverts commit b4f8f6671b3f0f1f8a43368d47046475d37f33d6.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/tcpdump/netdissect.h | 1 | ||||
| -rw-r--r-- | contrib/tcpdump/print-pfsync.c | 11 | ||||
| -rw-r--r-- | contrib/tcpdump/tcpdump.c | 3 |
3 files changed, 6 insertions, 9 deletions
diff --git a/contrib/tcpdump/netdissect.h b/contrib/tcpdump/netdissect.h index ea2920f..0cd7c12 100644 --- a/contrib/tcpdump/netdissect.h +++ b/contrib/tcpdump/netdissect.h @@ -577,7 +577,6 @@ extern void smtp_print(netdissect_options *, const u_char *, u_int); extern void geneve_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 *); /* stuff that has not yet been rototiled */ diff --git a/contrib/tcpdump/print-pfsync.c b/contrib/tcpdump/print-pfsync.c index 67d29cf..eb9aed8 100644 --- a/contrib/tcpdump/print-pfsync.c +++ b/contrib/tcpdump/print-pfsync.c @@ -54,20 +54,21 @@ static void print_src_dst(netdissect_options *, const struct pfsync_state_peer *, uint8_t); static void print_state(netdissect_options *, struct pfsync_state *); -u_int -pfsync_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, +#ifdef notyet +void +pfsync_if_print(u_char *user, const struct pcap_pkthdr *h, register const u_char *p) { u_int caplen = h->caplen; - ts_print(ndo, &h->ts); + ts_print(&h->ts); if (caplen < PFSYNC_HDRLEN) { ND_PRINT((ndo, "[|pfsync]")); goto out; } - pfsync_print(ndo, (struct pfsync_header *)p, + pfsync_print((struct pfsync_header *)p, p + sizeof(struct pfsync_header), caplen - sizeof(struct pfsync_header)); out: @@ -75,8 +76,8 @@ out: default_print((const u_char *)p, caplen); } safeputchar(ndo, '\n'); - return (caplen); } +#endif /* notyet */ void pfsync_ip_print(netdissect_options *ndo , const u_char *bp, u_int len) diff --git a/contrib/tcpdump/tcpdump.c b/contrib/tcpdump/tcpdump.c index 0939896..2bec0b8 100644 --- a/contrib/tcpdump/tcpdump.c +++ b/contrib/tcpdump/tcpdump.c @@ -305,9 +305,6 @@ static const struct ndo_printer ndo_printers[] = { #ifdef DLT_LINUX_SLL { sll_if_print, DLT_LINUX_SLL }, #endif -#if defined(DLT_PFSYNC) && defined(HAVE_NET_PFVAR_H) - { pfsync_if_print, DLT_PFSYNC}, -#endif #ifdef DLT_FR { fr_if_print, DLT_FR }, #endif |
