diff options
Diffstat (limited to 'contrib/libpcap/pcap-int.h')
| -rw-r--r-- | contrib/libpcap/pcap-int.h | 132 |
1 files changed, 74 insertions, 58 deletions
diff --git a/contrib/libpcap/pcap-int.h b/contrib/libpcap/pcap-int.h index 5a20444..7db7ff5 100644 --- a/contrib/libpcap/pcap-int.h +++ b/contrib/libpcap/pcap-int.h @@ -40,14 +40,16 @@ extern "C" { #endif -#ifdef WIN32 -#include <Packet32.h> -extern CRITICAL_SECTION g_PcapCompileCriticalSection; -#endif /* WIN32 */ - -#ifdef MSDOS -#include <fcntl.h> -#include <io.h> +#if defined(_WIN32) + /* + * Make sure Packet32.h doesn't define BPF structures that we've + * probably already defined as a result of including <pcap/pcap.h>. + */ + #define BPF_MAJOR_VERSION + #include <Packet32.h> +#elif defined(MSDOS) + #include <fcntl.h> + #include <io.h> #endif #if (defined(_MSC_VER) && (_MSC_VER <= 1200)) /* we are compiling with Visual Studio 6, that doesn't support the LL suffix*/ @@ -106,9 +108,9 @@ extern CRITICAL_SECTION g_PcapCompileCriticalSection; #define MAXIMUM_SNAPLEN 262144 struct pcap_opt { - char *source; + char *device; int timeout; /* timeout for buffering */ - int buffer_size; + u_int buffer_size; int promisc; int rfmon; /* monitor mode */ int immediate; /* immediate mode - deliver packets as soon as they arrive */ @@ -126,11 +128,19 @@ typedef int (*set_datalink_op_t)(pcap_t *, int); typedef int (*getnonblock_op_t)(pcap_t *, char *); typedef int (*setnonblock_op_t)(pcap_t *, int, char *); typedef int (*stats_op_t)(pcap_t *, struct pcap_stat *); -#ifdef WIN32 +#ifdef _WIN32 +typedef struct pcap_stat *(*stats_ex_op_t)(pcap_t *, int *); typedef int (*setbuff_op_t)(pcap_t *, int); typedef int (*setmode_op_t)(pcap_t *, int); typedef int (*setmintocopy_op_t)(pcap_t *, int); -typedef Adapter *(*getadapter_op_t)(pcap_t *); +typedef HANDLE (*getevent_op_t)(pcap_t *); +typedef int (*oid_get_request_op_t)(pcap_t *, bpf_u_int32, void *, size_t *); +typedef int (*oid_set_request_op_t)(pcap_t *, bpf_u_int32, const void *, size_t *); +typedef u_int (*sendqueue_transmit_op_t)(pcap_t *, pcap_send_queue *, int); +typedef int (*setuserbuffer_op_t)(pcap_t *, int); +typedef int (*live_dump_op_t)(pcap_t *, char *, int, int); +typedef int (*live_dump_ended_op_t)(pcap_t *, int); +typedef PAirpcapHandle (*get_airpcap_handle_op_t)(pcap_t *); #endif typedef void (*cleanup_op_t)(pcap_t *); @@ -145,24 +155,22 @@ struct pcap { read_op_t read_op; /* - * Method to call to read to read packets from a savefile. + * Method to call to read packets from a savefile. */ int (*next_packet_op)(pcap_t *, struct pcap_pkthdr *, u_char **); -#ifdef WIN32 +#ifdef _WIN32 ADAPTER *adapter; - LPPACKET Packet; - int nonblock; #else int fd; int selectable_fd; -#endif /* WIN32 */ +#endif /* _WIN32 */ /* * Read buffer. */ - int bufsize; - u_char *buffer; + u_int bufsize; + void *buffer; u_char *bp; int cc; @@ -172,7 +180,7 @@ struct pcap { int swapped; FILE *rfile; /* null if live capture, non-null if savefile */ - int fddipad; + u_int fddipad; struct pcap *next; /* list of open pcaps that need stuff cleared on close */ /* @@ -199,10 +207,19 @@ struct pcap { */ u_char *pkt; +#ifdef _WIN32 + struct pcap_stat stat; /* used for pcap_stats_ex() */ +#endif + /* We're accepting only packets in this direction/these directions. */ pcap_direction_t direction; /* + * Flags to affect BPF code generation. + */ + int bpf_codegen_flags; + + /* * Placeholder for filter code if bpf not in kernel. */ struct bpf_program fcode; @@ -235,20 +252,33 @@ struct pcap { */ pcap_handler oneshot_callback; -#ifdef WIN32 +#ifdef _WIN32 /* * These are, at least currently, specific to the Win32 NPF * driver. */ + stats_ex_op_t stats_ex_op; setbuff_op_t setbuff_op; setmode_op_t setmode_op; setmintocopy_op_t setmintocopy_op; - getadapter_op_t getadapter_op; + getevent_op_t getevent_op; + oid_get_request_op_t oid_get_request_op; + oid_set_request_op_t oid_set_request_op; + sendqueue_transmit_op_t sendqueue_transmit_op; + setuserbuffer_op_t setuserbuffer_op; + live_dump_op_t live_dump_op; + live_dump_ended_op_t live_dump_ended_op; + get_airpcap_handle_op_t get_airpcap_handle_op; #endif cleanup_op_t cleanup_op; }; /* + * BPF code generation flags. + */ +#define BPF_SPECIAL_VLAN_HANDLING 0x00000001 /* special VLAN handling for Linux */ + +/* * This is a timeval as stored in a savefile. * It has to use the same types everywhere, independent of the actual * `struct timeval'; `struct timeval' has 32-bit tv_sec values on some @@ -328,34 +358,15 @@ struct oneshot_userdata { pcap_t *pd; }; -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 *); - -#ifndef HAVE_STRLCPY -#define strlcpy(x, y, z) \ - (strncpy((x), (y), (z)), \ - ((z) <= 0 ? 0 : ((x)[(z) - 1] = '\0')), \ - strlen((y))) -#endif #include <stdarg.h> -#if !defined(HAVE_SNPRINTF) -#define snprintf pcap_snprintf -extern int snprintf (char *, size_t, const char *, ...); -#endif - -#if !defined(HAVE_VSNPRINTF) -#define vsnprintf pcap_vsnprintf -extern int vsnprintf (char *, size_t, const char *, va_list ap); -#endif +#include "portability.h" /* * Does the packet count argument to a module's read routine say @@ -366,7 +377,7 @@ extern int vsnprintf (char *, size_t, const char *, va_list ap); /* * Routines that most pcap implementations can use for non-blocking mode. */ -#if !defined(WIN32) && !defined(MSDOS) +#if !defined(_WIN32) && !defined(MSDOS) int pcap_getnonblock_fd(pcap_t *, char *); int pcap_setnonblock_fd(pcap_t *p, int, char *); #endif @@ -383,38 +394,43 @@ int pcap_setnonblock_fd(pcap_t *p, int, char *); * by pcap_create routines. */ pcap_t *pcap_create_interface(const char *, char *); -pcap_t *pcap_create_common(const char *, char *, size_t); +pcap_t *pcap_create_common(char *, size_t); int pcap_do_addexit(pcap_t *); void pcap_add_to_pcaps_to_close(pcap_t *); void pcap_remove_from_pcaps_to_close(pcap_t *); void pcap_cleanup_live_common(pcap_t *); -int pcap_not_initialized(pcap_t *); int pcap_check_activated(pcap_t *); /* * Internal interfaces for "pcap_findalldevs()". * - * "pcap_findalldevs_interfaces()" finds interfaces using the - * "standard" mechanisms (SIOCGIFCONF, "getifaddrs()", etc.). - * * "pcap_platform_finddevs()" is a platform-dependent routine to - * add devices not found by the "standard" mechanisms. + * find local network interfaces. + * + * "pcap_findalldevs_interfaces()" is a helper to find those interfaces + * using the "standard" mechanisms (SIOCGIFCONF, "getifaddrs()", etc.). * * "pcap_add_if()" adds an interface to the list of interfaces, for * use by various "find interfaces" routines. */ -int pcap_findalldevs_interfaces(pcap_if_t **, char *); int pcap_platform_finddevs(pcap_if_t **, char *); -int add_addr_to_iflist(pcap_if_t **, const char *, u_int, struct sockaddr *, - size_t, struct sockaddr *, size_t, struct sockaddr *, size_t, - struct sockaddr *, size_t, char *); +#if !defined(_WIN32) && !defined(MSDOS) +int pcap_findalldevs_interfaces(pcap_if_t **, char *, + int (*)(const char *)); +#endif +int add_addr_to_iflist(pcap_if_t **, const char *, bpf_u_int32, + struct sockaddr *, size_t, struct sockaddr *, size_t, + struct sockaddr *, size_t, struct sockaddr *, size_t, char *); int add_addr_to_dev(pcap_if_t *, struct sockaddr *, size_t, struct sockaddr *, size_t, struct sockaddr *, size_t, struct sockaddr *dstaddr, size_t, char *errbuf); -int pcap_add_if(pcap_if_t **, const char *, u_int, const char *, char *); -struct sockaddr *dup_sockaddr(struct sockaddr *, size_t); -int add_or_find_if(pcap_if_t **, pcap_if_t **, const char *, u_int, +int pcap_add_if(pcap_if_t **, const char *, bpf_u_int32, const char *, + char *); +int add_or_find_if(pcap_if_t **, pcap_if_t **, const char *, bpf_u_int32, const char *, char *); +#ifndef _WIN32 +bpf_u_int32 if_flags_to_pcap_flags(const char *, u_int); +#endif /* * Internal interfaces for "pcap_open_offline()". @@ -438,8 +454,8 @@ void sf_cleanup(pcap_t *p); */ void pcap_oneshot(u_char *, const struct pcap_pkthdr *, const u_char *); -#ifdef WIN32 -char *pcap_win32strerror(void); +#ifdef _WIN32 +void pcap_win32_err_to_str(DWORD, char *); #endif int install_bpf_program(pcap_t *, struct bpf_program *); |
