diff options
| author | rpaulo <rpaulo@FreeBSD.org> | 2010-10-29 18:43:23 +0000 |
|---|---|---|
| committer | rpaulo <rpaulo@FreeBSD.org> | 2010-10-29 18:43:23 +0000 |
| commit | 22f795f2fd7f982a2847bc9fc73e297abc7e2fbf (patch) | |
| tree | 99c17a1bdbff3dabc0f310509b912bf2775d2145 /contrib/libpcap/dlpisubs.c | |
| parent | 2631ae0f3d6c77323709cd35d1f7241624662320 (diff) | |
| parent | 724e1a015907ca989c4e1cb30c7ee4e88f26fbff (diff) | |
| download | FreeBSD-src-22f795f2fd7f982a2847bc9fc73e297abc7e2fbf.zip FreeBSD-src-22f795f2fd7f982a2847bc9fc73e297abc7e2fbf.tar.gz | |
Merge libpcap-1.1.1.
Diffstat (limited to 'contrib/libpcap/dlpisubs.c')
| -rw-r--r-- | contrib/libpcap/dlpisubs.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/contrib/libpcap/dlpisubs.c b/contrib/libpcap/dlpisubs.c index 441b8c0..23c78ce 100644 --- a/contrib/libpcap/dlpisubs.c +++ b/contrib/libpcap/dlpisubs.c @@ -12,13 +12,17 @@ */ #ifndef lint static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/libpcap/dlpisubs.c,v 1.1.2.2 2008-04-04 19:39:05 guy Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/libpcap/dlpisubs.c,v 1.3 2008-12-02 16:40:19 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H #include "config.h" #endif +#ifndef DL_IPATM +#define DL_IPATM 0x12 /* ATM Classical IP interface */ +#endif + #ifdef HAVE_SYS_BUFMOD_H /* * Size of a bufmod chunk to pass upstream; that appears to be the @@ -41,6 +45,7 @@ static const char rcsid[] _U_ = * what the value used to be - there's no particular reason why it * should be tied to MAXDLBUF, but we'll leave it as this for now. */ +#define MAXDLBUF 8192 #define PKTBUFSIZE (MAXDLBUF * sizeof(bpf_u_int32)) #endif @@ -64,7 +69,9 @@ static const char rcsid[] _U_ = #include "pcap-int.h" #include "dlpisubs.h" +#ifdef HAVE_SYS_BUFMOD_H static void pcap_stream_err(const char *, int, char *); +#endif /* * Get the packet statistics. @@ -339,6 +346,7 @@ strioctl(int fd, int cmd, int len, char *dp) return (str.ic_len); } +#ifdef HAVE_SYS_BUFMOD_H /* * Write stream error message to errbuf. */ @@ -347,3 +355,4 @@ pcap_stream_err(const char *func, int err, char *errbuf) { snprintf(errbuf, PCAP_ERRBUF_SIZE, "%s: %s", func, pcap_strerror(err)); } +#endif |
