diff options
| author | bms <bms@FreeBSD.org> | 2004-03-31 14:57:24 +0000 |
|---|---|---|
| committer | bms <bms@FreeBSD.org> | 2004-03-31 14:57:24 +0000 |
| commit | 55b12ee1997869e5aed19e4145ad34c6d874a423 (patch) | |
| tree | 5b810dd82a76f16819dd3cc55ffa53ff444b2d5a /contrib/tcpdump/print-fr.c | |
| parent | 34f833a812abe250ad28d7dadb1fdc086b1d4ecd (diff) | |
| download | FreeBSD-src-55b12ee1997869e5aed19e4145ad34c6d874a423.zip FreeBSD-src-55b12ee1997869e5aed19e4145ad34c6d874a423.tar.gz | |
Merge of tcpdump 3.8.3 from tcpdump.org, with the following caveats:
print-atm.c no longer performs special handling for FORE headers; these
can no doubt be re-added at a later date.
print-fr.c is effectively a no-op.
print-llc.c has had the default_print_unaligned() call removed as
tcpdump no longer defines this function, however the prototype is still
present. Suggest we roll in a diff to use print_unknown_data().
Diffstat (limited to 'contrib/tcpdump/print-fr.c')
| -rw-r--r-- | contrib/tcpdump/print-fr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/tcpdump/print-fr.c b/contrib/tcpdump/print-fr.c index 7039338..4e568b1 100644 --- a/contrib/tcpdump/print-fr.c +++ b/contrib/tcpdump/print-fr.c @@ -260,8 +260,8 @@ out: #include <stdio.h> #include "interface.h" -void -fr_if_print(u_char *user, const struct pcap_pkthdr *h, const u_char *p) +u_int +fr_if_print(const struct pcap_pkthdr *h, const u_char *p) { error("not configured for ppp"); /* NOTREACHED */ |
