Deleted Added
full compact
pcap-int.h (38151) pcap-int.h (56891)
1/*
2 * Copyright (c) 1994, 1995, 1996
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
1/*
2 * Copyright (c) 1994, 1995, 1996
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 16 unchanged lines hidden (view full) ---

25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#) $Header: pcap-int.h,v 1.18 96/11/27 18:43:09 leres Exp $ (LBL)
33 * $FreeBSD: head/contrib/libpcap/pcap-int.h 56891 2000-01-30 00:43:38Z fenner $
34 * @(#) $Header: /tcpdump/master/libpcap/pcap-int.h,v 1.20 1999/11/21 01:10:20 assar Exp $ (LBL)
34 */
35
36#ifndef pcap_int_h
37#define pcap_int_h
38
39#ifdef __cplusplus
40extern "C" {
41#endif

--- 54 unchanged lines hidden (view full) ---

96 /*
97 * Placeholder for filter code if bpf not in kernel.
98 */
99 struct bpf_program fcode;
100
101 char errbuf[PCAP_ERRBUF_SIZE];
102};
103
35 */
36
37#ifndef pcap_int_h
38#define pcap_int_h
39
40#ifdef __cplusplus
41extern "C" {
42#endif

--- 54 unchanged lines hidden (view full) ---

97 /*
98 * Placeholder for filter code if bpf not in kernel.
99 */
100 struct bpf_program fcode;
101
102 char errbuf[PCAP_ERRBUF_SIZE];
103};
104
105/*
106 * This is a timeval as stored in disk in a dumpfile.
107 * It has to use the same types everywhere, independent of the actual
108 * `struct timeval'
109 */
110
111struct pcap_timeval {
112 bpf_int32 tv_sec; /* seconds */
113 bpf_int32 tv_usec; /* microseconds */
114};
115
116/*
117 * How a `pcap_pkthdr' is actually stored in the dumpfile.
118 */
119
120struct pcap_sf_pkthdr {
121 struct pcap_timeval ts; /* time stamp */
122 bpf_u_int32 caplen; /* length of portion present */
123 bpf_u_int32 len; /* length this packet (off wire) */
124};
125
104int yylex(void);
105
106#ifndef min
107#define min(a, b) ((a) > (b) ? (b) : (a))
108#endif
109
110/* XXX should these be in pcap.h? */
111int pcap_offline_read(pcap_t *, int, pcap_handler, u_char *);
112int pcap_read(pcap_t *, int cnt, pcap_handler, u_char *);
113
114/* Ultrix pads to make everything line up on a nice boundary */
126int yylex(void);
127
128#ifndef min
129#define min(a, b) ((a) > (b) ? (b) : (a))
130#endif
131
132/* XXX should these be in pcap.h? */
133int pcap_offline_read(pcap_t *, int, pcap_handler, u_char *);
134int pcap_read(pcap_t *, int cnt, pcap_handler, u_char *);
135
136/* Ultrix pads to make everything line up on a nice boundary */
115#if defined(ultrix) || defined(__alpha)
137#if defined(ultrix) || defined(__alpha) || defined(__NetBSD__)
116#define PCAP_FDDIPAD 3
117#endif
118
119/* XXX */
120extern int pcap_fddipad;
121
122#ifdef __cplusplus
123}
124#endif
125
126#endif
138#define PCAP_FDDIPAD 3
139#endif
140
141/* XXX */
142extern int pcap_fddipad;
143
144#ifdef __cplusplus
145}
146#endif
147
148#endif