diff options
| author | Max Laier <mlaier@FreeBSD.org> | 2007-10-16 02:20:42 +0000 |
|---|---|---|
| committer | Max Laier <mlaier@FreeBSD.org> | 2007-10-16 02:20:42 +0000 |
| commit | b5bfcb5d8ae026769a67b6230c15014efc32f7fe (patch) | |
| tree | 01f74f6819cfb28636e2f6d04efefacdfecafc5c /contrib/tcpdump/interface.h | |
| parent | faeb38d111efa1ecad5565f314581e95ce3ac7f8 (diff) | |
| download | src-b5bfcb5d8ae026769a67b6230c15014efc32f7fe.tar.gz src-b5bfcb5d8ae026769a67b6230c15014efc32f7fe.zip | |
Import of tcpdump v3.9.8
Notes
Notes:
svn path=/vendor/tcpdump/dist/; revision=172683
Diffstat (limited to 'contrib/tcpdump/interface.h')
| -rw-r--r-- | contrib/tcpdump/interface.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/contrib/tcpdump/interface.h b/contrib/tcpdump/interface.h index dcbd9b29d475..49ba87d25711 100644 --- a/contrib/tcpdump/interface.h +++ b/contrib/tcpdump/interface.h @@ -18,7 +18,7 @@ * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.244.2.18 2005/09/29 07:46:45 hannes Exp $ (LBL) + * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.244.2.21 2007/03/28 07:45:46 hannes Exp $ (LBL) */ #ifndef tcpdump_interface_h @@ -108,6 +108,10 @@ extern char *strsep(char **, const char *); #endif #endif +#ifndef MIN +#define MIN(a,b) ((a)<(b)?(a):(b)) +#endif + extern char *program_name; /* used to generate self-identifying messages */ extern int32_t thiszone; /* seconds offset from gmt to local time */ @@ -152,7 +156,7 @@ extern char *read_infile(char *); extern char *copy_argv(char **); extern void safeputchar(int); -extern void safeputs(const char *); +extern void safeputs(const char *, int); extern const char *isonsap_string(const u_char *, register u_int); extern const char *protoid_string(const u_char *); @@ -202,6 +206,7 @@ extern u_int token_if_print(const struct pcap_pkthdr *, const u_char *); extern void fddi_print(const u_char *, u_int, u_int); extern u_int fddi_if_print(const struct pcap_pkthdr *, const u_char *); extern u_int fr_if_print(const struct pcap_pkthdr *, const u_char *); +extern u_int mfr_if_print(const struct pcap_pkthdr *, const u_char *); extern u_int fr_print(register const u_char *, u_int); extern u_int mfr_print(register const u_char *, u_int); extern u_int ieee802_11_if_print(const struct pcap_pkthdr *, const u_char *); @@ -226,6 +231,7 @@ extern void ns_print(const u_char *, u_int, int); extern void ntp_print(const u_char *, u_int); extern u_int null_if_print(const struct pcap_pkthdr *, const u_char *); extern void ospf_print(const u_char *, u_int, const u_char *); +extern void olsr_print (const u_char *, u_int); extern void pimv1_print(const u_char *, u_int); extern void cisco_autorp_print(const u_char *, u_int); extern void rsvp_print(const u_char *, u_int); |