diff options
Diffstat (limited to 'lib/libpcap/pcap.h')
| -rw-r--r-- | lib/libpcap/pcap.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lib/libpcap/pcap.h b/lib/libpcap/pcap.h index 5efc16c8868..d95adc6fec4 100644 --- a/lib/libpcap/pcap.h +++ b/lib/libpcap/pcap.h @@ -1,8 +1,7 @@ -/* $OpenBSD */ -/* $NetBSD: pcap.h,v 1.3.4.1 1996/06/05 18:04:46 cgd Exp $ */ +/* $OpenBSD: pcap.h,v 1.6 1996/07/12 13:19:12 mickey Exp $ */ /* - * Copyright (c) 1993, 1994 + * Copyright (c) 1993, 1994, 1995, 1996 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -33,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#) Header: pcap.h,v 1.15 94/06/14 20:03:34 leres Exp (LBL) + * @(#) Header: pcap.h,v 1.19 96/06/16 22:36:28 leres Exp (LBL) */ #ifndef lib_pcap_h @@ -56,8 +55,8 @@ * predates the bpf typedefs for 64-bit support. */ #if BPF_RELEASE - 0 < 199406 -typedef int32_t bpf_int32; -typedef u_int32_t bpf_u_int32; +typedef int bpf_int32; +typedef u_int bpf_u_int32; #endif typedef struct pcap pcap_t; @@ -66,7 +65,7 @@ typedef struct pcap_dumper pcap_dumper_t; /* * The first record in the file contains saved values for some * of the flags used in the printout phases of tcpdump. - * Many fields here are longs so compilers won't insert unwanted + * Many fields here are 32 bit ints so compilers won't insert unwanted * padding; these files need to be interchangeable across architectures. */ struct pcap_file_header { @@ -103,7 +102,7 @@ typedef void (*pcap_handler)(u_char *, const struct pcap_pkthdr *, const u_char *); char *pcap_lookupdev(char *); -int pcap_lookupnet(char *, u_int32_t *, u_int32_t *, char *); +int pcap_lookupnet(char *, bpf_u_int32 *, bpf_u_int32 *, char *); pcap_t *pcap_open_live(char *, int, int, int, char *); pcap_t *pcap_open_offline(char *, char *); void pcap_close(pcap_t *); @@ -116,7 +115,8 @@ int pcap_setfilter(pcap_t *, struct bpf_program *); void pcap_perror(pcap_t *, char *); char *pcap_strerror(int); char *pcap_geterr(pcap_t *); -int pcap_compile(pcap_t *, struct bpf_program *, char *, int, u_int32_t); +int pcap_compile(pcap_t *, struct bpf_program *, char *, int, + bpf_u_int32); /* XXX */ int pcap_freecode(pcap_t *, struct bpf_program *); int pcap_datalink(pcap_t *); @@ -137,4 +137,7 @@ void pcap_dump(u_char *, const struct pcap_pkthdr *, const u_char *); u_int bpf_filter(struct bpf_insn *, u_char *, u_int, u_int); char *bpf_image(struct bpf_insn *, int); +/* XXX */ +extern int pcap_fddipad; + #endif |