diff options
| author |   deraadt <deraadt@openbsd.org> | 1999-07-20 04:49:54 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 1999-07-20 04:49:54 +0000 |
| commit | 01efc7ef8ab68f8ab38c9fcffd34efd1d036b4b9 (patch) | |
| tree | dfb5b8767bf0f7b2e8338f28172ba9469908e509 /lib/libpcap/pcap-int.h | |
| parent | sync (diff) | |
| download | wireguard-openbsd-01efc7ef8ab68f8ab38c9fcffd34efd1d036b4b9.tar.xz wireguard-openbsd-01efc7ef8ab68f8ab38c9fcffd34efd1d036b4b9.zip | |
changes brought in from v0.4; started by brad, more by me, being tested by mts
Diffstat (limited to 'lib/libpcap/pcap-int.h')
| -rw-r--r-- | lib/libpcap/pcap-int.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/lib/libpcap/pcap-int.h b/lib/libpcap/pcap-int.h index 4b64994c83b..47e20c93af5 100644 --- a/lib/libpcap/pcap-int.h +++ b/lib/libpcap/pcap-int.h @@ -1,7 +1,7 @@ -/* $OpenBSD: pcap-int.h,v 1.6 1996/08/03 12:38:44 niklas Exp $ */ +/* $OpenBSD: pcap-int.h,v 1.7 1999/07/20 04:49:55 deraadt Exp $ */ /* - * Copyright (c) 1994, 1995 + * Copyright (c) 1994, 1995, 1996 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) Header: pcap-int.h,v 1.14 95/10/21 22:04:49 leres Exp (LBL) + * @(#) $Header: /home/cvs/src/lib/libpcap/pcap-int.h,v 1.7 1999/07/20 04:49:55 deraadt Exp $ (LBL) */ #ifndef pcap_int_h @@ -60,6 +60,11 @@ struct pcap_md { u_long TotDrops; /* count of dropped packets */ long TotMissed; /* missed by i/f during this run */ long OrigMissed; /* missed by i/f before this run */ +#ifdef linux + int pad; + int skip; + char *device; +#endif }; struct pcap { @@ -67,6 +72,7 @@ struct pcap { int snapshot; int linktype; int tzoff; /* timezone offset */ + int offset; /* offset for proper alignment */ struct pcap_sf sf; struct pcap_md md; @@ -95,6 +101,10 @@ struct pcap { int yylex(void); +#ifndef min +#define min(a, b) ((a) > (b) ? (b) : (a)) +#endif + /* XXX should these be in pcap.h? */ int pcap_offline_read(pcap_t *, int, pcap_handler, u_char *); int pcap_read(pcap_t *, int cnt, pcap_handler, u_char *); @@ -103,4 +113,7 @@ int pcap_read(pcap_t *, int cnt, pcap_handler, u_char *); #if defined(ultrix) || defined(__alpha) #define PCAP_FDDIPAD 3 #endif + +/* XXX */ +extern int pcap_fddipad; #endif |