From 8367543ac8bcbe233bc94b3267987aa49b92a487 Mon Sep 17 00:00:00 2001 From: Robert Graham <robert_david_graham@yahoo.com> Date: Tue, 30 May 2017 03:01:44 -0400 Subject: [PATCH] Remove libpcap dependency for Windows --- src/rawsock-pcap.c | 45 +- src/rawsock-pcap.h | 35 +- src/rawsock.c | 40 +- vs10/include/Packet32.h | 359 ------------ vs10/include/Win32-Extensions.h | 113 ---- vs10/include/bittypes.h | 137 ----- vs10/include/ip6_misc.h | 165 ------ vs10/include/pcap-bpf.h | 47 -- vs10/include/pcap-namedb.h | 42 -- vs10/include/pcap-stdinc.h | 90 --- vs10/include/pcap.h | 45 -- vs10/include/pcap/bluetooth.h | 48 -- vs10/include/pcap/bpf.h | 934 -------------------------------- vs10/include/pcap/namedb.h | 89 --- vs10/include/pcap/pcap.h | 407 -------------- vs10/include/pcap/sll.h | 129 ----- vs10/include/pcap/usb.h | 90 --- vs10/include/pcap/vlan.h | 46 -- vs10/include/remote-ext.h | 444 --------------- vs10/lib/Packet.lib | Bin 8450 -> 0 bytes vs10/lib/libpacket.a | Bin 20822 -> 0 bytes vs10/lib/libwpcap.a | Bin 53028 -> 0 bytes vs10/lib/wpcap.lib | Bin 18882 -> 0 bytes vs10/lib/x64/Packet.lib | Bin 8290 -> 0 bytes vs10/lib/x64/wpcap.lib | Bin 18466 -> 0 bytes vs10/masscan.vcxproj | 2 + vs10/masscan.vcxproj.filters | 6 + 27 files changed, 90 insertions(+), 3223 deletions(-) delete mode 100644 vs10/include/Packet32.h delete mode 100644 vs10/include/Win32-Extensions.h delete mode 100644 vs10/include/bittypes.h delete mode 100644 vs10/include/ip6_misc.h delete mode 100644 vs10/include/pcap-bpf.h delete mode 100644 vs10/include/pcap-namedb.h delete mode 100644 vs10/include/pcap-stdinc.h delete mode 100644 vs10/include/pcap.h delete mode 100644 vs10/include/pcap/bluetooth.h delete mode 100644 vs10/include/pcap/bpf.h delete mode 100644 vs10/include/pcap/namedb.h delete mode 100644 vs10/include/pcap/pcap.h delete mode 100644 vs10/include/pcap/sll.h delete mode 100644 vs10/include/pcap/usb.h delete mode 100644 vs10/include/pcap/vlan.h delete mode 100644 vs10/include/remote-ext.h delete mode 100644 vs10/lib/Packet.lib delete mode 100644 vs10/lib/libpacket.a delete mode 100644 vs10/lib/libwpcap.a delete mode 100644 vs10/lib/wpcap.lib delete mode 100644 vs10/lib/x64/Packet.lib delete mode 100644 vs10/lib/x64/wpcap.lib diff --git a/src/rawsock-pcap.c b/src/rawsock-pcap.c index 8909c46..ae03c8a 100644 --- a/src/rawsock-pcap.c +++ b/src/rawsock-pcap.c @@ -38,6 +38,8 @@ #ifndef UNUSEDPARM #ifdef __GNUC__ #define UNUSEDPARM(x) x=(x) +#else +#define UNUSEDPARM(x) x=(x) #endif #endif @@ -234,6 +236,7 @@ struct PcapFunctions PCAP = { static void *my_null(int x, ...) { + UNUSEDPARM(x); return 0; } static pcap_t *null_PCAP_OPEN_OFFLINE(const char *fname, char *errbuf) @@ -242,23 +245,29 @@ static pcap_t *null_PCAP_OPEN_OFFLINE(const char *fname, char *errbuf) } static int null_PCAP_SENDPACKET(pcap_t *p, const unsigned char *buf, int size) { - return (int)my_null(p, buf, size); + my_null(3, p, buf, size); + return 0; } static const unsigned char *null_PCAP_NEXT(pcap_t *p, struct pcap_pkthdr *h) { + my_null(3, p, h); return 0; } static int null_PCAP_SETDIRECTION(pcap_t *p, pcap_direction_t d) { + my_null(2, p, d); return 0; } static const char *null_PCAP_DATALINK_VAL_TO_NAME(int dlt) { + my_null(1, dlt); return 0; } static void null_PCAP_PERROR(pcap_t *p, char *prefix) { + UNUSEDPARM(p); + fprintf(stderr, "%s\n", prefix); perror("pcap"); } static const char *null_PCAP_DEV_NAME(const pcap_if_t *dev) @@ -274,6 +283,29 @@ static const pcap_if_t *null_PCAP_DEV_NEXT(const pcap_if_t *dev) return dev->next; } +static pcap_send_queue *null_PCAP_SENDQUEUE_ALLOC(size_t size) +{ + UNUSEDPARM(size); + return 0; +} +static unsigned null_PCAP_SENDQUEUE_TRANSMIT(pcap_t *p, pcap_send_queue *queue, int sync) +{ + my_null(3, p, queue, sync); + return 0; +} +static void null_PCAP_SENDQUEUE_DESTROY(pcap_send_queue *queue) +{ + my_null(1, queue); + UNUSEDPARM(queue); +} +static int null_PCAP_SENDQUEUE_QUEUE(pcap_send_queue *queue, + const struct pcap_pkthdr *pkt_header, + const unsigned char *pkt_data) +{ + my_null(4, queue, pkt_header, pkt_data); + return 0; +} + /** * Runtime-load the libpcap shared-object or the winpcap DLL. We * load at runtime rather than loadtime to allow this program to @@ -284,9 +316,9 @@ void pcap_init(void) { struct PcapFunctions *pl = &PCAP; #ifdef WIN32 - HMODULE hPacket; - HMODULE hLibpcap; - HMODULE hAirpcap; + void * hPacket; + void * hLibpcap; + void * hAirpcap; pl->is_available = 0; pl->is_printing_debug = 1; @@ -405,6 +437,11 @@ pl->func_err=0, pl->datalink = null_##PCAP_DATALINK; DOLINK(PCAP_DEV_DESCRIPTION , dev_description); DOLINK(PCAP_DEV_NEXT , dev_next); + DOLINK(PCAP_SENDQUEUE_ALLOC , sendqueue_alloc); + DOLINK(PCAP_SENDQUEUE_TRANSMIT , sendqueue_transmit); + DOLINK(PCAP_SENDQUEUE_DESTROY , sendqueue_destroy); + DOLINK(PCAP_SENDQUEUE_QUEUE , sendqueue_queue); + pl->can_transmit = null_CAN_TRANSMIT; diff --git a/src/rawsock-pcap.h b/src/rawsock-pcap.h index 615cced..0a5180b 100644 --- a/src/rawsock-pcap.h +++ b/src/rawsock-pcap.h @@ -1,6 +1,11 @@ #ifndef RAWSOCK_PCAP_H #define RAWSOCK_PCAP_H -#include <sys/time.h> +#include <stdio.h> + +struct pcap_timeval { + long tv_sec; /* seconds */ + long tv_usec; /* and microseconds */ +}; struct pcap; typedef struct pcap pcap_t; @@ -17,7 +22,7 @@ typedef enum { } pcap_direction_t; struct pcap_pkthdr { - struct timeval ts; + struct pcap_timeval ts; unsigned caplen; unsigned len; #ifdef __APPLE__ @@ -51,6 +56,21 @@ typedef const char *(*PCAP_DEV_NAME)(const pcap_if_t *dev); typedef const char *(*PCAP_DEV_DESCRIPTION)(const pcap_if_t *dev); typedef const pcap_if_t *(*PCAP_DEV_NEXT)(const pcap_if_t *dev); +/* + * PORTABILITY: Windows supports the "sendq" feature, and is really slow + * without this feature. It's not needed on Linux, so we just create + * equivelent functions that do nothing + */ +struct pcap_send_queue; +typedef struct pcap_send_queue pcap_send_queue; + +typedef pcap_send_queue *(*PCAP_SENDQUEUE_ALLOC)(size_t size); +typedef unsigned (*PCAP_SENDQUEUE_TRANSMIT)(pcap_t *p, pcap_send_queue *queue, int sync); +typedef void (*PCAP_SENDQUEUE_DESTROY)(pcap_send_queue *queue); +typedef int (*PCAP_SENDQUEUE_QUEUE)(pcap_send_queue *queue, const struct pcap_pkthdr *pkt_header, const unsigned char *pkt_data); + + + struct PcapFunctions { @@ -84,10 +104,15 @@ struct PcapFunctions { PCAP_DATALINK_VAL_TO_NAME datalink_val_to_name; PCAP_PERROR perror; - PCAP_DEV_NAME dev_name; + PCAP_DEV_NAME dev_name; PCAP_DEV_DESCRIPTION dev_description; - PCAP_DEV_NEXT dev_next; - + PCAP_DEV_NEXT dev_next; + + PCAP_SENDQUEUE_ALLOC sendqueue_alloc; + PCAP_SENDQUEUE_TRANSMIT sendqueue_transmit; + PCAP_SENDQUEUE_DESTROY sendqueue_destroy; + PCAP_SENDQUEUE_QUEUE sendqueue_queue; + }; extern struct PcapFunctions PCAP; diff --git a/src/rawsock.c b/src/rawsock.c index 536f52a..921f6bb 100644 --- a/src/rawsock.c +++ b/src/rawsock.c @@ -12,8 +12,8 @@ #include "rawsock-pfring.h" #include "pixie-timer.h" #include "main-globals.h" + #include "rawsock-pcap.h" -//#include <pcap.h> #include <assert.h> #include <ctype.h> @@ -21,12 +21,10 @@ static int is_pcap_file = 0; #ifdef WIN32 -#include <Win32-Extensions.h> +#include <winsock.h> #include <iphlpapi.h> #if defined(_MSC_VER) -#pragma comment(lib, "packet.lib") -#pragma comment(lib, "wpcap.lib") #pragma comment(lib, "IPHLPAPI.lib") #endif @@ -39,20 +37,6 @@ static int is_pcap_file = 0; #include <net/if.h> #include <arpa/inet.h> -/* - * PORTABILITY: Windows supports the "sendq" feature, and is really slow - * without this feature. It's not needed on Linux, so we just create - * equivelent functions that do nothing - */ -struct pcap_send_queue; -typedef struct pcap_send_queue pcap_send_queue; -static pcap_send_queue *pcap_sendqueue_alloc(size_t size) {return 0;} -static unsigned pcap_sendqueue_transmit( - pcap_t *p, pcap_send_queue *queue, int sync) {return 0;} -static void pcap_sendqueue_destroy(pcap_send_queue *queue) {;} -static int pcap_sendqueue_queue(pcap_send_queue *queue, - const struct pcap_pkthdr *pkt_header, - const unsigned char *pkt_data) {return 0;} #else #endif @@ -78,7 +62,7 @@ int pcap_setdirection(pcap_t *pcap, pcap_direction_t direction) static int (*real_setdirection)(pcap_t *, pcap_direction_t) = 0; if (real_setdirection == 0) { - HMODULE h = LoadLibraryA("wpcap.dll"); + void* h = LoadLibraryA("wpcap.dll"); if (h == NULL) { fprintf(stderr, "couldn't load wpcap.dll: %u\n", (unsigned)GetLastError()); @@ -274,12 +258,12 @@ void rawsock_flush(struct Adapter *adapter) { if (adapter->sendq) { - pcap_sendqueue_transmit(adapter->pcap, adapter->sendq, 0); + PCAP.sendqueue_transmit(adapter->pcap, adapter->sendq, 0); /* Dude, I totally forget why this step is necessary. I vaguely * remember there's a good reason for it though */ - pcap_sendqueue_destroy(adapter->sendq); - adapter->sendq = pcap_sendqueue_alloc(SENDQ_SIZE); + PCAP.sendqueue_destroy(adapter->sendq); + adapter->sendq = PCAP.sendqueue_alloc(SENDQ_SIZE); } } @@ -326,10 +310,10 @@ rawsock_send_packet( hdr.len = length; hdr.caplen = length; - err = pcap_sendqueue_queue(adapter->sendq, &hdr, packet); + err = PCAP.sendqueue_queue(adapter->sendq, &hdr, packet); if (err) { rawsock_flush(adapter); - pcap_sendqueue_queue(adapter->sendq, &hdr, packet); + PCAP.sendqueue_queue(adapter->sendq, &hdr, packet); } if (flush) { @@ -513,7 +497,7 @@ rawsock_ignore_transmits(struct Adapter *adapter, const unsigned char *adapter_m PCAP.perror(adapter->pcap, "pcap_setdirection(IN)"); } } -#else +#elif defined(WIN32xxx) if (adapter->pcap) { int err; char filter[256]; @@ -543,8 +527,6 @@ rawsock_ignore_transmits(struct Adapter *adapter, const unsigned char *adapter_m } } #endif - - } /*************************************************************************** @@ -559,7 +541,7 @@ rawsock_close_adapter(struct Adapter *adapter) PCAP.close(adapter->pcap); } if (adapter->sendq) { - pcap_sendqueue_destroy(adapter->sendq); + PCAP.sendqueue_destroy(adapter->sendq); } free(adapter); @@ -835,7 +817,7 @@ rawsock_init_adapter(const char *adapter_name, adapter->sendq = 0; #if defined(WIN32) if (is_sendq) - adapter->sendq = pcap_sendqueue_alloc(SENDQ_SIZE); + adapter->sendq = PCAP.sendqueue_alloc(SENDQ_SIZE); #endif diff --git a/vs10/include/Packet32.h b/vs10/include/Packet32.h deleted file mode 100644 index 1e0eacd..0000000 --- a/vs10/include/Packet32.h +++ /dev/null @@ -1,359 +0,0 @@ -/* - * Copyright (c) 1999 - 2005 NetGroup, Politecnico di Torino (Italy) - * Copyright (c) 2005 - 2007 CACE Technologies, Davis (California) - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Politecnico di Torino, CACE Technologies - * nor the names of its contributors may be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -/** @ingroup packetapi - * @{ - */ - -/** @defgroup packet32h Packet.dll definitions and data structures - * Packet32.h contains the data structures and the definitions used by packet.dll. - * The file is used both by the Win9x and the WinNTx versions of packet.dll, and can be included - * by the applications that use the functions of this library - * @{ - */ - -#ifndef __PACKET32 -#define __PACKET32 - -#include <winsock2.h> - -#ifdef HAVE_AIRPCAP_API -#include <airpcap.h> -#else -#if !defined(AIRPCAP_HANDLE__EAE405F5_0171_9592_B3C2_C19EC426AD34__DEFINED_) -#define AIRPCAP_HANDLE__EAE405F5_0171_9592_B3C2_C19EC426AD34__DEFINED_ -typedef struct _AirpcapHandle *PAirpcapHandle; -#endif /* AIRPCAP_HANDLE__EAE405F5_0171_9592_B3C2_C19EC426AD34__DEFINED_ */ -#endif /* HAVE_AIRPCAP_API */ - -#ifdef HAVE_DAG_API -#include <dagc.h> -#endif /* HAVE_DAG_API */ - -// Working modes -#define PACKET_MODE_CAPT 0x0 ///< Capture mode -#define PACKET_MODE_STAT 0x1 ///< Statistical mode -#define PACKET_MODE_MON 0x2 ///< Monitoring mode -#define PACKET_MODE_DUMP 0x10 ///< Dump mode -#define PACKET_MODE_STAT_DUMP MODE_DUMP | MODE_STAT ///< Statistical dump Mode - - -/// Alignment macro. Defines the alignment size. -#define Packet_ALIGNMENT sizeof(int) -/// Alignment macro. Rounds up to the next even multiple of Packet_ALIGNMENT. -#define Packet_WORDALIGN(x) (((x)+(Packet_ALIGNMENT-1))&~(Packet_ALIGNMENT-1)) - -#define NdisMediumNull -1 ///< Custom linktype: NDIS doesn't provide an equivalent -#define NdisMediumCHDLC -2 ///< Custom linktype: NDIS doesn't provide an equivalent -#define NdisMediumPPPSerial -3 ///< Custom linktype: NDIS doesn't provide an equivalent -#define NdisMediumBare80211 -4 ///< Custom linktype: NDIS doesn't provide an equivalent -#define NdisMediumRadio80211 -5 ///< Custom linktype: NDIS doesn't provide an equivalent -#define NdisMediumPpi -6 ///< Custom linktype: NDIS doesn't provide an equivalent - -// Loopback behaviour definitions -#define NPF_DISABLE_LOOPBACK 1 ///< Drop the packets sent by the NPF driver -#define NPF_ENABLE_LOOPBACK 2 ///< Capture the packets sent by the NPF driver - -/*! - \brief Network type structure. - - This structure is used by the PacketGetNetType() function to return information on the current adapter's type and speed. -*/ -typedef struct NetType -{ - UINT LinkType; ///< The MAC of the current network adapter (see function PacketGetNetType() for more information) - ULONGLONG LinkSpeed; ///< The speed of the network in bits per second -}NetType; - - -//some definitions stolen from libpcap - -#ifndef BPF_MAJOR_VERSION - -/*! - \brief A BPF pseudo-assembly program. - - The program will be injected in the kernel by the PacketSetBPF() function and applied to every incoming packet. -*/ -struct bpf_program -{ - UINT bf_len; ///< Indicates the number of instructions of the program, i.e. the number of struct bpf_insn that will follow. - struct bpf_insn *bf_insns; ///< A pointer to the first instruction of the program. -}; - -/*! - \brief A single BPF pseudo-instruction. - - bpf_insn contains a single instruction for the BPF register-machine. It is used to send a filter program to the driver. -*/ -struct bpf_insn -{ - USHORT code; ///< Instruction type and addressing mode. - UCHAR jt; ///< Jump if true - UCHAR jf; ///< Jump if false - int k; ///< Generic field used for various purposes. -}; - -/*! - \brief Structure that contains a couple of statistics values on the current capture. - - It is used by packet.dll to return statistics about a capture session. -*/ -struct bpf_stat -{ - UINT bs_recv; ///< Number of packets that the driver received from the network adapter - ///< from the beginning of the current capture. This value includes the packets - ///< lost by the driver. - UINT bs_drop; ///< number of packets that the driver lost from the beginning of a capture. - ///< Basically, a packet is lost when the the buffer of the driver is full. - ///< In this situation the packet cannot be stored and the driver rejects it. - UINT ps_ifdrop; ///< drops by interface. XXX not yet supported - UINT bs_capt; ///< number of packets that pass the filter, find place in the kernel buffer and - ///< thus reach the application. -}; - -/*! - \brief Packet header. - - This structure defines the header associated with every packet delivered to the application. -*/ -struct bpf_hdr -{ - struct timeval bh_tstamp; ///< The timestamp associated with the captured packet. - ///< It is stored in a TimeVal structure. - UINT bh_caplen; ///< Length of captured portion. The captured portion <b>can be different</b> - ///< from the original packet, because it is possible (with a proper filter) - ///< to instruct the driver to capture only a portion of the packets. - UINT bh_datalen; ///< Original length of packet - USHORT bh_hdrlen; ///< Length of bpf header (this struct plus alignment padding). In some cases, - ///< a padding could be added between the end of this structure and the packet - ///< data for performance reasons. This filed can be used to retrieve the actual data - ///< of the packet. -}; - -/*! - \brief Dump packet header. - - This structure defines the header associated with the packets in a buffer to be used with PacketSendPackets(). - It is simpler than the bpf_hdr, because it corresponds to the header associated by WinPcap and libpcap to a - packet in a dump file. This makes straightforward sending WinPcap dump files to the network. -*/ -struct dump_bpf_hdr{ - struct timeval ts; ///< Time stamp of the packet - UINT caplen; ///< Length of captured portion. The captured portion can smaller than the - ///< the original packet, because it is possible (with a proper filter) to - ///< instruct the driver to capture only a portion of the packets. - UINT len; ///< Length of the original packet (off wire). -}; - - -#endif - -struct bpf_stat; - -#define DOSNAMEPREFIX TEXT("Packet_") ///< Prefix added to the adapters device names to create the WinPcap devices -#define MAX_LINK_NAME_LENGTH 64 //< Maximum length of the devices symbolic links -#define NMAX_PACKET 65535 - -/*! - \brief Addresses of a network adapter. - - This structure is used by the PacketGetNetInfoEx() function to return the IP addresses associated with - an adapter. -*/ -typedef struct npf_if_addr { - struct sockaddr_storage IPAddress; ///< IP address. - struct sockaddr_storage SubnetMask; ///< Netmask for that address. - struct sockaddr_storage Broadcast; ///< Broadcast address. -}npf_if_addr; - - -#define ADAPTER_NAME_LENGTH 256 + 12 ///< Maximum length for the name of an adapter. The value is the same used by the IP Helper API. -#define ADAPTER_DESC_LENGTH 128 ///< Maximum length for the description of an adapter. The value is the same used by the IP Helper API. -#define MAX_MAC_ADDR_LENGTH 8 ///< Maximum length for the link layer address of an adapter. The value is the same used by the IP Helper API. -#define MAX_NETWORK_ADDRESSES 16 ///< Maximum length for the link layer address of an adapter. The value is the same used by the IP Helper API. - - -typedef struct WAN_ADAPTER_INT WAN_ADAPTER; ///< Describes an opened wan (dialup, VPN...) network adapter using the NetMon API -typedef WAN_ADAPTER *PWAN_ADAPTER; ///< Describes an opened wan (dialup, VPN...) network adapter using the NetMon API - -#define INFO_FLAG_NDIS_ADAPTER 0 ///< Flag for ADAPTER_INFO: this is a traditional ndis adapter -#define INFO_FLAG_NDISWAN_ADAPTER 1 ///< Flag for ADAPTER_INFO: this is a NdisWan adapter, and it's managed by WANPACKET -#define INFO_FLAG_DAG_CARD 2 ///< Flag for ADAPTER_INFO: this is a DAG card -#define INFO_FLAG_DAG_FILE 6 ///< Flag for ADAPTER_INFO: this is a DAG file -#define INFO_FLAG_DONT_EXPORT 8 ///< Flag for ADAPTER_INFO: when this flag is set, the adapter will not be listed or openend by winpcap. This allows to prevent exporting broken network adapters, like for example FireWire ones. -#define INFO_FLAG_AIRPCAP_CARD 16 ///< Flag for ADAPTER_INFO: this is an airpcap card -#define INFO_FLAG_NPFIM_DEVICE 32 - -/*! - \brief Describes an opened network adapter. - - This structure is the most important for the functioning of packet.dll, but the great part of its fields - should be ignored by the user, since the library offers functions that avoid to cope with low-level parameters -*/ -typedef struct _ADAPTER { - HANDLE hFile; ///< \internal Handle to an open instance of the NPF driver. - CHAR SymbolicLink[MAX_LINK_NAME_LENGTH]; ///< \internal A string containing the name of the network adapter currently opened. - int NumWrites; ///< \internal Number of times a packets written on this adapter will be repeated - ///< on the wire. - HANDLE ReadEvent; ///< A notification event associated with the read calls on the adapter. - ///< It can be passed to standard Win32 functions (like WaitForSingleObject - ///< or WaitForMultipleObjects) to wait until the driver's buffer contains some - ///< data. It is particularly useful in GUI applications that need to wait - ///< concurrently on several events. In Windows NT/2000 the PacketSetMinToCopy() - ///< function can be used to define the minimum amount of data in the kernel buffer - ///< that will cause the event to be signalled. - - UINT ReadTimeOut; ///< \internal The amount of time after which a read on the driver will be released and - ///< ReadEvent will be signaled, also if no packets were captured - CHAR Name[ADAPTER_NAME_LENGTH]; - PWAN_ADAPTER pWanAdapter; - UINT Flags; ///< Adapter's flags. Tell if this adapter must be treated in a different way, using the Netmon API or the dagc API. - -#ifdef HAVE_AIRPCAP_API - PAirpcapHandle AirpcapAd; -#endif // HAVE_AIRPCAP_API - -#ifdef HAVE_NPFIM_API - void* NpfImHandle; -#endif // HAVE_NPFIM_API - -#ifdef HAVE_DAG_API - dagc_t *pDagCard; ///< Pointer to the dagc API adapter descriptor for this adapter - PCHAR DagBuffer; ///< Pointer to the buffer with the packets that is received from the DAG card - struct timeval DagReadTimeout; ///< Read timeout. The dagc API requires a timeval structure - unsigned DagFcsLen; ///< Length of the frame check sequence attached to any packet by the card. Obtained from the registry - DWORD DagFastProcess; ///< True if the user requests fast capture processing on this card. Higher level applications can use this value to provide a faster but possibly unprecise capture (for example, libpcap doesn't convert the timestamps). -#endif // HAVE_DAG_API -} ADAPTER, *LPADAPTER; - -/*! - \brief Structure that contains a group of packets coming from the driver. - - This structure defines the header associated with every packet delivered to the application. -*/ -typedef struct _PACKET { - HANDLE hEvent; ///< \deprecated Still present for compatibility with old applications. - OVERLAPPED OverLapped; ///< \deprecated Still present for compatibility with old applications. - PVOID Buffer; ///< Buffer with containing the packets. See the PacketReceivePacket() for - ///< details about the organization of the data in this buffer - UINT Length; ///< Length of the buffer - DWORD ulBytesReceived; ///< Number of valid bytes present in the buffer, i.e. amount of data - ///< received by the last call to PacketReceivePacket() - BOOLEAN bIoComplete; ///< \deprecated Still present for compatibility with old applications. -} PACKET, *LPPACKET; - -/*! - \brief Structure containing an OID request. - - It is used by the PacketRequest() function to send an OID to the interface card driver. - It can be used, for example, to retrieve the status of the error counters on the adapter, its MAC address, - the list of the multicast groups defined on it, and so on. -*/ -struct _PACKET_OID_DATA { - ULONG Oid; ///< OID code. See the Microsoft DDK documentation or the file ntddndis.h - ///< for a complete list of valid codes. - ULONG Length; ///< Length of the data field - UCHAR Data[1]; ///< variable-lenght field that contains the information passed to or received - ///< from the adapter. -}; -typedef struct _PACKET_OID_DATA PACKET_OID_DATA, *PPACKET_OID_DATA; - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @} - */ - -/* -BOOLEAN QueryWinPcapRegistryStringA(CHAR *SubKeyName, - CHAR *Value, - UINT *pValueLen, - CHAR *DefaultVal); - -BOOLEAN QueryWinPcapRegistryStringW(WCHAR *SubKeyName, - WCHAR *Value, - UINT *pValueLen, - WCHAR *DefaultVal); -*/ - -//--------------------------------------------------------------------------- -// EXPORTED FUNCTIONS -//--------------------------------------------------------------------------- - -PCHAR PacketGetVersion(); -PCHAR PacketGetDriverVersion(); -BOOLEAN PacketSetMinToCopy(LPADAPTER AdapterObject,int nbytes); -BOOLEAN PacketSetNumWrites(LPADAPTER AdapterObject,int nwrites); -BOOLEAN PacketSetMode(LPADAPTER AdapterObject,int mode); -BOOLEAN PacketSetReadTimeout(LPADAPTER AdapterObject,int timeout); -BOOLEAN PacketSetBpf(LPADAPTER AdapterObject,struct bpf_program *fp); -BOOLEAN PacketSetLoopbackBehavior(LPADAPTER AdapterObject, UINT LoopbackBehavior); -INT PacketSetSnapLen(LPADAPTER AdapterObject,int snaplen); -BOOLEAN PacketGetStats(LPADAPTER AdapterObject,struct bpf_stat *s); -BOOLEAN PacketGetStatsEx(LPADAPTER AdapterObject,struct bpf_stat *s); -BOOLEAN PacketSetBuff(LPADAPTER AdapterObject,int dim); -BOOLEAN PacketGetNetType (LPADAPTER AdapterObject,NetType *type); -LPADAPTER PacketOpenAdapter(PCHAR AdapterName); -BOOLEAN PacketSendPacket(LPADAPTER AdapterObject,LPPACKET pPacket,BOOLEAN Sync); -INT PacketSendPackets(LPADAPTER AdapterObject,PVOID PacketBuff,ULONG Size, BOOLEAN Sync); -LPPACKET PacketAllocatePacket(void); -VOID PacketInitPacket(LPPACKET lpPacket,PVOID Buffer,UINT Length); -VOID PacketFreePacket(LPPACKET lpPacket); -BOOLEAN PacketReceivePacket(LPADAPTER AdapterObject,LPPACKET lpPacket,BOOLEAN Sync); -BOOLEAN PacketSetHwFilter(LPADAPTER AdapterObject,ULONG Filter); -BOOLEAN PacketGetAdapterNames(PTSTR pStr,PULONG BufferSize); -BOOLEAN PacketGetNetInfoEx(PCHAR AdapterName, npf_if_addr* buffer, PLONG NEntries); -BOOLEAN PacketRequest(LPADAPTER AdapterObject,BOOLEAN Set,PPACKET_OID_DATA OidData); -HANDLE PacketGetReadEvent(LPADAPTER AdapterObject); -BOOLEAN PacketSetDumpName(LPADAPTER AdapterObject, void *name, int len); -BOOLEAN PacketSetDumpLimits(LPADAPTER AdapterObject, UINT maxfilesize, UINT maxnpacks); -BOOLEAN PacketIsDumpEnded(LPADAPTER AdapterObject, BOOLEAN sync); -BOOL PacketStopDriver(); -VOID PacketCloseAdapter(LPADAPTER lpAdapter); -BOOLEAN PacketStartOem(PCHAR errorString, UINT errorStringLength); -BOOLEAN PacketStartOemEx(PCHAR errorString, UINT errorStringLength, ULONG flags); -PAirpcapHandle PacketGetAirPcapHandle(LPADAPTER AdapterObject); - -// -// Used by PacketStartOemEx -// -#define PACKET_START_OEM_NO_NETMON 0x00000001 - -#ifdef __cplusplus -} -#endif - -#endif //__PACKET32 diff --git a/vs10/include/Win32-Extensions.h b/vs10/include/Win32-Extensions.h deleted file mode 100644 index d3b063b..0000000 --- a/vs10/include/Win32-Extensions.h +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Copyright (c) 1999 - 2005 NetGroup, Politecnico di Torino (Italy) - * Copyright (c) 2005 - 2006 CACE Technologies, Davis (California) - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Politecnico di Torino, CACE Technologies - * nor the names of its contributors may be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - -#ifndef __WIN32_EXTENSIONS_H__ -#define __WIN32_EXTENSIONS_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -/* Definitions */ - -/*! - \brief A queue of raw packets that will be sent to the network with pcap_sendqueue_transmit(). -*/ -struct pcap_send_queue -{ - u_int maxlen; ///< Maximum size of the the queue, in bytes. This variable contains the size of the buffer field. - u_int len; ///< Current size of the queue, in bytes. - char *buffer; ///< Buffer containing the packets to be sent. -}; - -typedef struct pcap_send_queue pcap_send_queue; - -/*! - \brief This typedef is a support for the pcap_get_airpcap_handle() function -*/ -#if !defined(AIRPCAP_HANDLE__EAE405F5_0171_9592_B3C2_C19EC426AD34__DEFINED_) -#define AIRPCAP_HANDLE__EAE405F5_0171_9592_B3C2_C19EC426AD34__DEFINED_ -typedef struct _AirpcapHandle *PAirpcapHandle; -#endif - -#define BPF_MEM_EX_IMM 0xc0 -#define BPF_MEM_EX_IND 0xe0 - -/*used for ST*/ -#define BPF_MEM_EX 0xc0 -#define BPF_TME 0x08 - -#define BPF_LOOKUP 0x90 -#define BPF_EXECUTE 0xa0 -#define BPF_INIT 0xb0 -#define BPF_VALIDATE 0xc0 -#define BPF_SET_ACTIVE 0xd0 -#define BPF_RESET 0xe0 -#define BPF_SET_MEMORY 0x80 -#define BPF_GET_REGISTER_VALUE 0x70 -#define BPF_SET_REGISTER_VALUE 0x60 -#define BPF_SET_WORKING 0x50 -#define BPF_SET_ACTIVE_READ 0x40 -#define BPF_SET_AUTODELETION 0x30 -#define BPF_SEPARATION 0xff - -/* Prototypes */ -pcap_send_queue* pcap_sendqueue_alloc(u_int memsize); - -void pcap_sendqueue_destroy(pcap_send_queue* queue); - -int pcap_sendqueue_queue(pcap_send_queue* queue, const struct pcap_pkthdr *pkt_header, const u_char *pkt_data); - -u_int pcap_sendqueue_transmit(pcap_t *p, pcap_send_queue* queue, int sync); - -HANDLE pcap_getevent(pcap_t *p); - -struct pcap_stat *pcap_stats_ex(pcap_t *p, int *pcap_stat_size); - -int pcap_setuserbuffer(pcap_t *p, int size); - -int pcap_live_dump(pcap_t *p, char *filename, int maxsize, int maxpacks); - -int pcap_live_dump_ended(pcap_t *p, int sync); - -int pcap_offline_filter(struct bpf_program *prog, const struct pcap_pkthdr *header, const u_char *pkt_data); - -int pcap_start_oem(char* err_str, int flags); - -PAirpcapHandle pcap_get_airpcap_handle(pcap_t *p); - -#ifdef __cplusplus -} -#endif - -#endif //__WIN32_EXTENSIONS_H__ diff --git a/vs10/include/bittypes.h b/vs10/include/bittypes.h deleted file mode 100644 index 558a0b5..0000000 --- a/vs10/include/bittypes.h +++ /dev/null @@ -1,137 +0,0 @@ -/* - * Copyright (C) 1999 WIDE Project. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the project nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ -#ifndef _BITTYPES_H -#define _BITTYPES_H - -#ifndef HAVE_U_INT8_T - -#if SIZEOF_CHAR == 1 -typedef unsigned char u_int8_t; -typedef signed char int8_t; -#elif SIZEOF_INT == 1 -typedef unsigned int u_int8_t; -typedef signed int int8_t; -#else /* XXX */ -#error "there's no appropriate type for u_int8_t" -#endif -#define HAVE_U_INT8_T 1 -#define HAVE_INT8_T 1 - -#endif /* HAVE_U_INT8_T */ - -#ifndef HAVE_U_INT16_T - -#if SIZEOF_SHORT == 2 -typedef unsigned short u_int16_t; -typedef signed short int16_t; -#elif SIZEOF_INT == 2 -typedef unsigned int u_int16_t; -typedef signed int int16_t; -#elif SIZEOF_CHAR == 2 -typedef unsigned char u_int16_t; -typedef signed char int16_t; -#else /* XXX */ -#error "there's no appropriate type for u_int16_t" -#endif -#define HAVE_U_INT16_T 1 -#define HAVE_INT16_T 1 - -#endif /* HAVE_U_INT16_T */ - -#ifndef HAVE_U_INT32_T - -#if SIZEOF_INT == 4 -typedef unsigned int u_int32_t; -typedef signed int int32_t; -#elif SIZEOF_LONG == 4 -typedef unsigned long u_int32_t; -typedef signed long int32_t; -#elif SIZEOF_SHORT == 4 -typedef unsigned short u_int32_t; -typedef signed short int32_t; -#else /* XXX */ -#error "there's no appropriate type for u_int32_t" -#endif -#define HAVE_U_INT32_T 1 -#define HAVE_INT32_T 1 - -#endif /* HAVE_U_INT32_T */ - -#ifndef HAVE_U_INT64_T -#if SIZEOF_LONG_LONG == 8 -typedef unsigned long long u_int64_t; -typedef long long int64_t; -#elif defined(_MSC_EXTENSIONS) -typedef unsigned _int64 u_int64_t; -typedef _int64 int64_t; -#elif SIZEOF_INT == 8 -typedef unsigned int u_int64_t; -#elif SIZEOF_LONG == 8 -typedef unsigned long u_int64_t; -#elif SIZEOF_SHORT == 8 -typedef unsigned short u_int64_t; -#else /* XXX */ -#error "there's no appropriate type for u_int64_t" -#endif - -#endif /* HAVE_U_INT64_T */ - -#ifndef PRId64 -#ifdef _MSC_EXTENSIONS -#define PRId64 "I64d" -#else /* _MSC_EXTENSIONS */ -#define PRId64 "lld" -#endif /* _MSC_EXTENSIONS */ -#endif /* PRId64 */ - -#ifndef PRIo64 -#ifdef _MSC_EXTENSIONS -#define PRIo64 "I64o" -#else /* _MSC_EXTENSIONS */ -#define PRIo64 "llo" -#endif /* _MSC_EXTENSIONS */ -#endif /* PRIo64 */ - -#ifndef PRIx64 -#ifdef _MSC_EXTENSIONS -#define PRIx64 "I64x" -#else /* _MSC_EXTENSIONS */ -#define PRIx64 "llx" -#endif /* _MSC_EXTENSIONS */ -#endif /* PRIx64 */ - -#ifndef PRIu64 -#ifdef _MSC_EXTENSIONS -#define PRIu64 "I64u" -#else /* _MSC_EXTENSIONS */ -#define PRIu64 "llu" -#endif /* _MSC_EXTENSIONS */ -#endif /* PRIu64 */ - -#endif /* _BITTYPES_H */ diff --git a/vs10/include/ip6_misc.h b/vs10/include/ip6_misc.h deleted file mode 100644 index bbeca07..0000000 --- a/vs10/include/ip6_misc.h +++ /dev/null @@ -1,165 +0,0 @@ -/* - * Copyright (c) 1993, 1994, 1997 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that: (1) source code distributions - * retain the above copyright notice and this paragraph in its entirety, (2) - * distributions including binary code include the above copyright notice and - * this paragraph in its entirety in the documentation or other materials - * provided with the distribution, and (3) all advertising materials mentioning - * features or use of this software display the following acknowledgement: - * ``This product includes software developed by the University of California, - * Lawrence Berkeley Laboratory and its contributors.'' Neither the name of - * the University nor the names of its contributors may be used to endorse - * or promote products derived from this software without specific prior - * written permission. - * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - * - * @(#) $Header: /tcpdump/master/libpcap/Win32/Include/ip6_misc.h,v 1.5 2006/01/22 18:02:18 gianluca Exp $ (LBL) - */ - -/* - * This file contains a collage of declarations for IPv6 from FreeBSD not present in Windows - */ - -#include <winsock2.h> - -#ifndef __MINGW32__ -#include <ws2tcpip.h> -#endif /* __MINGW32__ */ - -#ifndef __MINGW32__ -#define IN_MULTICAST(a) IN_CLASSD(a) -#endif - -#define IN_EXPERIMENTAL(a) ((((u_int32_t) (a)) & 0xf0000000) == 0xf0000000) - -#define IN_LOOPBACKNET 127 - -#ifdef __MINGW32__ -/* IPv6 address */ -struct in6_addr - { - union - { - u_int8_t u6_addr8[16]; - u_int16_t u6_addr16[8]; - u_int32_t u6_addr32[4]; - } in6_u; -#define s6_addr in6_u.u6_addr8 -#define s6_addr16 in6_u.u6_addr16 -#define s6_addr32 in6_u.u6_addr32 -#define s6_addr64 in6_u.u6_addr64 - }; - -#define IN6ADDR_ANY_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 } -#define IN6ADDR_LOOPBACK_INIT { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 } -#endif /* __MINGW32__ */ - - -#if (defined WIN32) || (defined __MINGW32__) -typedef unsigned short sa_family_t; -#endif - - -#ifdef __MINGW32__ - -#define __SOCKADDR_COMMON(sa_prefix) \ - sa_family_t sa_prefix##family - -/* Ditto, for IPv6. */ -struct sockaddr_in6 - { - __SOCKADDR_COMMON (sin6_); - u_int16_t sin6_port; /* Transport layer port # */ - u_int32_t sin6_flowinfo; /* IPv6 flow information */ - struct in6_addr sin6_addr; /* IPv6 address */ - }; - -#define IN6_IS_ADDR_V4MAPPED(a) \ - ((((u_int32_t *) (a))[0] == 0) && (((u_int32_t *) (a))[1] == 0) && \ - (((u_int32_t *) (a))[2] == htonl (0xffff))) - -#define IN6_IS_ADDR_MULTICAST(a) (((u_int8_t *) (a))[0] == 0xff) - -#define IN6_IS_ADDR_LINKLOCAL(a) \ - ((((u_int32_t *) (a))[0] & htonl (0xffc00000)) == htonl (0xfe800000)) - -#define IN6_IS_ADDR_LOOPBACK(a) \ - (((u_int32_t *) (a))[0] == 0 && ((u_int32_t *) (a))[1] == 0 && \ - ((u_int32_t *) (a))[2] == 0 && ((u_int32_t *) (a))[3] == htonl (1)) -#endif /* __MINGW32__ */ - -#define ip6_vfc ip6_ctlun.ip6_un2_vfc -#define ip6_flow ip6_ctlun.ip6_un1.ip6_un1_flow -#define ip6_plen ip6_ctlun.ip6_un1.ip6_un1_plen -#define ip6_nxt ip6_ctlun.ip6_un1.ip6_un1_nxt -#define ip6_hlim ip6_ctlun.ip6_un1.ip6_un1_hlim -#define ip6_hops ip6_ctlun.ip6_un1.ip6_un1_hlim - -#define nd_rd_type nd_rd_hdr.icmp6_type -#define nd_rd_code nd_rd_hdr.icmp6_code -#define nd_rd_cksum nd_rd_hdr.icmp6_cksum -#define nd_rd_reserved nd_rd_hdr.icmp6_data32[0] - -/* - * IPV6 extension headers - */ -#define IPPROTO_HOPOPTS 0 /* IPv6 hop-by-hop options */ -#define IPPROTO_IPV6 41 /* IPv6 header. */ -#define IPPROTO_ROUTING 43 /* IPv6 routing header */ -#define IPPROTO_FRAGMENT 44 /* IPv6 fragmentation header */ -#define IPPROTO_ESP 50 /* encapsulating security payload */ -#define IPPROTO_AH 51 /* authentication header */ -#define IPPROTO_ICMPV6 58 /* ICMPv6 */ -#define IPPROTO_NONE 59 /* IPv6 no next header */ -#define IPPROTO_DSTOPTS 60 /* IPv6 destination options */ -#define IPPROTO_PIM 103 /* Protocol Independent Multicast. */ - -#define IPV6_RTHDR_TYPE_0 0 - -/* Option types and related macros */ -#define IP6OPT_PAD1 0x00 /* 00 0 00000 */ -#define IP6OPT_PADN 0x01 /* 00 0 00001 */ -#define IP6OPT_JUMBO 0xC2 /* 11 0 00010 = 194 */ -#define IP6OPT_JUMBO_LEN 6 -#define IP6OPT_ROUTER_ALERT 0x05 /* 00 0 00101 */ - -#define IP6OPT_RTALERT_LEN 4 -#define IP6OPT_RTALERT_MLD 0 /* Datagram contains an MLD message */ -#define IP6OPT_RTALERT_RSVP 1 /* Datagram contains an RSVP message */ -#define IP6OPT_RTALERT_ACTNET 2 /* contains an Active Networks msg */ -#define IP6OPT_MINLEN 2 - -#define IP6OPT_BINDING_UPDATE 0xc6 /* 11 0 00110 */ -#define IP6OPT_BINDING_ACK 0x07 /* 00 0 00111 */ -#define IP6OPT_BINDING_REQ 0x08 /* 00 0 01000 */ -#define IP6OPT_HOME_ADDRESS 0xc9 /* 11 0 01001 */ -#define IP6OPT_EID 0x8a /* 10 0 01010 */ - -#define IP6OPT_TYPE(o) ((o) & 0xC0) -#define IP6OPT_TYPE_SKIP 0x00 -#define IP6OPT_TYPE_DISCARD 0x40 -#define IP6OPT_TYPE_FORCEICMP 0x80 -#define IP6OPT_TYPE_ICMP 0xC0 - -#define IP6OPT_MUTABLE 0x20 - - -#ifdef __MINGW32__ -#ifndef EAI_ADDRFAMILY -struct addrinfo { - int ai_flags; /* AI_PASSIVE, AI_CANONNAME */ - int ai_family; /* PF_xxx */ - int ai_socktype; /* SOCK_xxx */ - int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */ - size_t ai_addrlen; /* length of ai_addr */ - char *ai_canonname; /* canonical name for hostname */ - struct sockaddr *ai_addr; /* binary address */ - struct addrinfo *ai_next; /* next structure in linked list */ -}; -#endif -#endif /* __MINGW32__ */ diff --git a/vs10/include/pcap-bpf.h b/vs10/include/pcap-bpf.h deleted file mode 100644 index 5fe129d..0000000 --- a/vs10/include/pcap-bpf.h +++ /dev/null @@ -1,47 +0,0 @@ -/*- - * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from the Stanford/CMU enet packet filter, - * (net/enet.c) distributed as part of 4.3BSD, and code contributed - * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence - * Berkeley Laboratory. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#) $Header: /tcpdump/master/libpcap/pcap-bpf.h,v 1.50 2007/04/01 21:43:55 guy Exp $ (LBL) - */ - -/* - * For backwards compatibility. - * - * Note to OS vendors: do NOT get rid of this file! Some applications - * might expect to be able to include <pcap-bpf.h>. - */ -#include <pcap/bpf.h> diff --git a/vs10/include/pcap-namedb.h b/vs10/include/pcap-namedb.h deleted file mode 100644 index 80a2f00..0000000 --- a/vs10/include/pcap-namedb.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 1994, 1996 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the Computer Systems - * Engineering Group at Lawrence Berkeley Laboratory. - * 4. Neither the name of the University nor of the Laboratory may be used - * to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#) $Header: /tcpdump/master/libpcap/pcap-namedb.h,v 1.13 2006/10/04 18:13:32 guy Exp $ (LBL) - */ - -/* - * For backwards compatibility. - * - * Note to OS vendors: do NOT get rid of this file! Some applications - * might expect to be able to include <pcap-namedb.h>. - */ -#include <pcap/namedb.h> diff --git a/vs10/include/pcap-stdinc.h b/vs10/include/pcap-stdinc.h deleted file mode 100644 index 870e334..0000000 --- a/vs10/include/pcap-stdinc.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2002 - 2003 - * NetGroup, Politecnico di Torino (Italy) - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Politecnico di Torino nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * @(#) $Header: /tcpdump/master/libpcap/pcap-stdinc.h,v 1.10.2.1 2008-10-06 15:38:39 gianluca Exp $ (LBL) - */ - -#define SIZEOF_CHAR 1 -#define SIZEOF_SHORT 2 -#define SIZEOF_INT 4 -#ifndef _MSC_EXTENSIONS -#define SIZEOF_LONG_LONG 8 -#endif - -/* - * Avoids a compiler warning in case this was already defined - * (someone defined _WINSOCKAPI_ when including 'windows.h', in order - * to prevent it from including 'winsock.h') - */ -#ifdef _WINSOCKAPI_ -#undef _WINSOCKAPI_ -#endif -#include <winsock2.h> - -#include <fcntl.h> - -#include "bittypes.h" -#include <time.h> -#include <io.h> - -#ifndef __MINGW32__ -#include "IP6_misc.h" -#endif - -#define caddr_t char* - -#define snprintf _snprintf -#define vsnprintf _vsnprintf -#define strdup _strdup -#define inline __inline - -#ifdef __MINGW32__ -#include <stdint.h> -#else /*__MINGW32__*/ -/* MSVC compiler */ -#ifndef _UINTPTR_T_DEFINED -#ifdef _WIN64 -typedef unsigned __int64 uintptr_t; -#else -typedef _W64 unsigned int uintptr_t; -#endif -#define _UINTPTR_T_DEFINED -#endif - -#ifndef _INTPTR_T_DEFINED -#ifdef _WIN64 -typedef __int64 intptr_t; -#else -typedef _W64 int intptr_t; -#endif -#define _INTPTR_T_DEFINED -#endif - -#endif /*__MINGW32__*/ diff --git a/vs10/include/pcap.h b/vs10/include/pcap.h deleted file mode 100644 index 935f949..0000000 --- a/vs10/include/pcap.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright (c) 1993, 1994, 1995, 1996, 1997 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the Computer Systems - * Engineering Group at Lawrence Berkeley Laboratory. - * 4. Neither the name of the University nor of the Laboratory may be used - * to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#) $Header: /tcpdump/master/libpcap/pcap.h,v 1.59 2006/10/04 18:09:22 guy Exp $ (LBL) - */ - -/* - * For backwards compatibility. - * - * Note to OS vendors: do NOT get rid of this file! Many applications - * expect to be able to include <pcap.h>, and at least some of them - * go through contortions in their configure scripts to try to detect - * OSes that have "helpfully" moved pcap.h to <pcap/pcap.h> without - * leaving behind a <pcap.h> file. - */ -#include <pcap/pcap.h> diff --git a/vs10/include/pcap/bluetooth.h b/vs10/include/pcap/bluetooth.h deleted file mode 100644 index 7bf65df..0000000 --- a/vs10/include/pcap/bluetooth.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2006 Paolo Abeni (Italy) - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * bluetooth data struct - * By Paolo Abeni <paolo.abeni@email.it> - * - * @(#) $Header: /tcpdump/master/libpcap/pcap/bluetooth.h,v 1.1 2007/09/22 02:10:17 guy Exp $ - */ - -#ifndef _PCAP_BLUETOOTH_STRUCTS_H__ -#define _PCAP_BLUETOOTH_STRUCTS_H__ - -/* - * Header prepended libpcap to each bluetooth h:4 frame. - * fields are in network byte order - */ -typedef struct _pcap_bluetooth_h4_header { - u_int32_t direction; /* if first bit is set direction is incoming */ -} pcap_bluetooth_h4_header; - - -#endif diff --git a/vs10/include/pcap/bpf.h b/vs10/include/pcap/bpf.h deleted file mode 100644 index 9f4ca33..0000000 --- a/vs10/include/pcap/bpf.h +++ /dev/null @@ -1,934 +0,0 @@ -/*- - * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from the Stanford/CMU enet packet filter, - * (net/enet.c) distributed as part of 4.3BSD, and code contributed - * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence - * Berkeley Laboratory. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#)bpf.h 7.1 (Berkeley) 5/7/91 - * - * @(#) $Header: /tcpdump/master/libpcap/pcap/bpf.h,v 1.19.2.8 2008-09-22 20:16:01 guy Exp $ (LBL) - */ - -/* - * This is libpcap's cut-down version of bpf.h; it includes only - * the stuff needed for the code generator and the userland BPF - * interpreter, and the libpcap APIs for setting filters, etc.. - * - * "pcap-bpf.c" will include the native OS version, as it deals with - * the OS's BPF implementation. - * - * XXX - should this all just be moved to "pcap.h"? - */ - -#ifndef BPF_MAJOR_VERSION - -#ifdef __cplusplus -extern "C" { -#endif - -/* BSD style release date */ -#define BPF_RELEASE 199606 - -#ifdef MSDOS /* must be 32-bit */ -typedef long bpf_int32; -typedef unsigned long bpf_u_int32; -#else -typedef int bpf_int32; -typedef u_int bpf_u_int32; -#endif - -/* - * Alignment macros. BPF_WORDALIGN rounds up to the next - * even multiple of BPF_ALIGNMENT. - */ -#ifndef __NetBSD__ -#define BPF_ALIGNMENT sizeof(bpf_int32) -#else -#define BPF_ALIGNMENT sizeof(long) -#endif -#define BPF_WORDALIGN(x) (((x)+(BPF_ALIGNMENT-1))&~(BPF_ALIGNMENT-1)) - -#define BPF_MAXBUFSIZE 0x8000 -#define BPF_MINBUFSIZE 32 - -/* - * Structure for "pcap_compile()", "pcap_setfilter()", etc.. - */ -struct bpf_program { - u_int bf_len; - struct bpf_insn *bf_insns; -}; - -/* - * Struct return by BIOCVERSION. This represents the version number of - * the filter language described by the instruction encodings below. - * bpf understands a program iff kernel_major == filter_major && - * kernel_minor >= filter_minor, that is, if the value returned by the - * running kernel has the same major number and a minor number equal - * equal to or less than the filter being downloaded. Otherwise, the - * results are undefined, meaning an error may be returned or packets - * may be accepted haphazardly. - * It has nothing to do with the source code version. - */ -struct bpf_version { - u_short bv_major; - u_short bv_minor; -}; -/* Current version number of filter architecture. */ -#define BPF_MAJOR_VERSION 1 -#define BPF_MINOR_VERSION 1 - -/* - * Data-link level type codes. - * - * Do *NOT* add new values to this list without asking - * "tcpdump-workers@lists.tcpdump.org" for a value. Otherwise, you run - * the risk of using a value that's already being used for some other - * purpose, and of having tools that read libpcap-format captures not - * being able to handle captures with your new DLT_ value, with no hope - * that they will ever be changed to do so (as that would destroy their - * ability to read captures using that value for that other purpose). - */ - -/* - * These are the types that are the same on all platforms, and that - * have been defined by <net/bpf.h> for ages. - */ -#define DLT_NULL 0 /* BSD loopback encapsulation */ -#define DLT_EN10MB 1 /* Ethernet (10Mb) */ -#define DLT_EN3MB 2 /* Experimental Ethernet (3Mb) */ -#define DLT_AX25 3 /* Amateur Radio AX.25 */ -#define DLT_PRONET 4 /* Proteon ProNET Token Ring */ -#define DLT_CHAOS 5 /* Chaos */ -#define DLT_IEEE802 6 /* 802.5 Token Ring */ -#define DLT_ARCNET 7 /* ARCNET, with BSD-style header */ -#define DLT_SLIP 8 /* Serial Line IP */ -#define DLT_PPP 9 /* Point-to-point Protocol */ -#define DLT_FDDI 10 /* FDDI */ - -/* - * These are types that are different on some platforms, and that - * have been defined by <net/bpf.h> for ages. We use #ifdefs to - * detect the BSDs that define them differently from the traditional - * libpcap <net/bpf.h> - * - * XXX - DLT_ATM_RFC1483 is 13 in BSD/OS, and DLT_RAW is 14 in BSD/OS, - * but I don't know what the right #define is for BSD/OS. - */ -#define DLT_ATM_RFC1483 11 /* LLC-encapsulated ATM */ - -#ifdef __OpenBSD__ -#define DLT_RAW 14 /* raw IP */ -#else -#define DLT_RAW 12 /* raw IP */ -#endif - -/* - * Given that the only OS that currently generates BSD/OS SLIP or PPP - * is, well, BSD/OS, arguably everybody should have chosen its values - * for DLT_SLIP_BSDOS and DLT_PPP_BSDOS, which are 15 and 16, but they - * didn't. So it goes. - */ -#if defined(__NetBSD__) || defined(__FreeBSD__) -#ifndef DLT_SLIP_BSDOS -#define DLT_SLIP_BSDOS 13 /* BSD/OS Serial Line IP */ -#define DLT_PPP_BSDOS 14 /* BSD/OS Point-to-point Protocol */ -#endif -#else -#define DLT_SLIP_BSDOS 15 /* BSD/OS Serial Line IP */ -#define DLT_PPP_BSDOS 16 /* BSD/OS Point-to-point Protocol */ -#endif - -/* - * 17 is used for DLT_OLD_PFLOG in OpenBSD; - * OBSOLETE: DLT_PFLOG is 117 in OpenBSD now as well. See below. - * 18 is used for DLT_PFSYNC in OpenBSD; don't use it for anything else. - */ - -#define DLT_ATM_CLIP 19 /* Linux Classical-IP over ATM */ - -/* - * Apparently Redback uses this for its SmartEdge 400/800. I hope - * nobody else decided to use it, too. - */ -#define DLT_REDBACK_SMARTEDGE 32 - -/* - * These values are defined by NetBSD; other platforms should refrain from - * using them for other purposes, so that NetBSD savefiles with link - * types of 50 or 51 can be read as this type on all platforms. - */ -#define DLT_PPP_SERIAL 50 /* PPP over serial with HDLC encapsulation */ -#define DLT_PPP_ETHER 51 /* PPP over Ethernet */ - -/* - * The Axent Raptor firewall - now the Symantec Enterprise Firewall - uses - * a link-layer type of 99 for the tcpdump it supplies. The link-layer - * header has 6 bytes of unknown data, something that appears to be an - * Ethernet type, and 36 bytes that appear to be 0 in at least one capture - * I've seen. - */ -#define DLT_SYMANTEC_FIREWALL 99 - -/* - * Values between 100 and 103 are used in capture file headers as - * link-layer types corresponding to DLT_ types that differ - * between platforms; don't use those values for new DLT_ new types. - */ - -/* - * This value was defined by libpcap 0.5; platforms that have defined - * it with a different value should define it here with that value - - * a link type of 104 in a save file will be mapped to DLT_C_HDLC, - * whatever value that happens to be, so programs will correctly - * handle files with that link type regardless of the value of - * DLT_C_HDLC. - * - * The name DLT_C_HDLC was used by BSD/OS; we use that name for source - * compatibility with programs written for BSD/OS. - * - * libpcap 0.5 defined it as DLT_CHDLC; we define DLT_CHDLC as well, - * for source compatibility with programs written for libpcap 0.5. - */ -#define DLT_C_HDLC 104 /* Cisco HDLC */ -#define DLT_CHDLC DLT_C_HDLC - -#define DLT_IEEE802_11 105 /* IEEE 802.11 wireless */ - -/* - * 106 is reserved for Linux Classical IP over ATM; it's like DLT_RAW, - * except when it isn't. (I.e., sometimes it's just raw IP, and - * sometimes it isn't.) We currently handle it as DLT_LINUX_SLL, - * so that we don't have to worry about the link-layer header.) - */ - -/* - * Frame Relay; BSD/OS has a DLT_FR with a value of 11, but that collides - * with other values. - * DLT_FR and DLT_FRELAY packets start with the Q.922 Frame Relay header - * (DLCI, etc.). - */ -#define DLT_FRELAY 107 - -/* - * OpenBSD DLT_LOOP, for loopback devices; it's like DLT_NULL, except - * that the AF_ type in the link-layer header is in network byte order. - * - * DLT_LOOP is 12 in OpenBSD, but that's DLT_RAW in other OSes, so - * we don't use 12 for it in OSes other than OpenBSD. - */ -#ifdef __OpenBSD__ -#define DLT_LOOP 12 -#else -#define DLT_LOOP 108 -#endif - -/* - * Encapsulated packets for IPsec; DLT_ENC is 13 in OpenBSD, but that's - * DLT_SLIP_BSDOS in NetBSD, so we don't use 13 for it in OSes other - * than OpenBSD. - */ -#ifdef __OpenBSD__ -#define DLT_ENC 13 -#else -#define DLT_ENC 109 -#endif - -/* - * Values between 110 and 112 are reserved for use in capture file headers - * as link-layer types corresponding to DLT_ types that might differ - * between platforms; don't use those values for new DLT_ types - * other than the corresponding DLT_ types. - */ - -/* - * This is for Linux cooked sockets. - */ -#define DLT_LINUX_SLL 113 - -/* - * Apple LocalTalk hardware. - */ -#define DLT_LTALK 114 - -/* - * Acorn Econet. - */ -#define DLT_ECONET 115 - -/* - * Reserved for use with OpenBSD ipfilter. - */ -#define DLT_IPFILTER 116 - -/* - * OpenBSD DLT_PFLOG; DLT_PFLOG is 17 in OpenBSD, but that's DLT_LANE8023 - * in SuSE 6.3, so we can't use 17 for it in capture-file headers. - * - * XXX: is there a conflict with DLT_PFSYNC 18 as well? - */ -#ifdef __OpenBSD__ -#define DLT_OLD_PFLOG 17 -#define DLT_PFSYNC 18 -#endif -#define DLT_PFLOG 117 - -/* - * Registered for Cisco-internal use. - */ -#define DLT_CISCO_IOS 118 - -/* - * For 802.11 cards using the Prism II chips, with a link-layer - * header including Prism monitor mode information plus an 802.11 - * header. - */ -#define DLT_PRISM_HEADER 119 - -/* - * Reserved for Aironet 802.11 cards, with an Aironet link-layer header - * (see Doug Ambrisko's FreeBSD patches). - */ -#define DLT_AIRONET_HEADER 120 - -/* - * Reserved for Siemens HiPath HDLC. - */ -#define DLT_HHDLC 121 - -/* - * This is for RFC 2625 IP-over-Fibre Channel. - * - * This is not for use with raw Fibre Channel, where the link-layer - * header starts with a Fibre Channel frame header; it's for IP-over-FC, - * where the link-layer header starts with an RFC 2625 Network_Header - * field. - */ -#define DLT_IP_OVER_FC 122 - -/* - * This is for Full Frontal ATM on Solaris with SunATM, with a - * pseudo-header followed by an AALn PDU. - * - * There may be other forms of Full Frontal ATM on other OSes, - * with different pseudo-headers. - * - * If ATM software returns a pseudo-header with VPI/VCI information - * (and, ideally, packet type information, e.g. signalling, ILMI, - * LANE, LLC-multiplexed traffic, etc.), it should not use - * DLT_ATM_RFC1483, but should get a new DLT_ value, so tcpdump - * and the like don't have to infer the presence or absence of a - * pseudo-header and the form of the pseudo-header. - */ -#define DLT_SUNATM 123 /* Solaris+SunATM */ - -/* - * Reserved as per request from Kent Dahlgren <kent@praesum.com> - * for private use. - */ -#define DLT_RIO 124 /* RapidIO */ -#define DLT_PCI_EXP 125 /* PCI Express */ -#define DLT_AURORA 126 /* Xilinx Aurora link layer */ - -/* - * Header for 802.11 plus a number of bits of link-layer information - * including radio information, used by some recent BSD drivers as - * well as the madwifi Atheros driver for Linux. - */ -#define DLT_IEEE802_11_RADIO 127 /* 802.11 plus radiotap radio header */ - -/* - * Reserved for the TZSP encapsulation, as per request from - * Chris Waters <chris.waters@networkchemistry.com> - * TZSP is a generic encapsulation for any other link type, - * which includes a means to include meta-information - * with the packet, e.g. signal strength and channel - * for 802.11 packets. - */ -#define DLT_TZSP 128 /* Tazmen Sniffer Protocol */ - -/* - * BSD's ARCNET headers have the source host, destination host, - * and type at the beginning of the packet; that's what's handed - * up to userland via BPF. - * - * Linux's ARCNET headers, however, have a 2-byte offset field - * between the host IDs and the type; that's what's handed up - * to userland via PF_PACKET sockets. - * - * We therefore have to have separate DLT_ values for them. - */ -#define DLT_ARCNET_LINUX 129 /* ARCNET */ - -/* - * Juniper-private data link types, as per request from - * Hannes Gredler <hannes@juniper.net>. The DLT_s are used - * for passing on chassis-internal metainformation such as - * QOS profiles, etc.. - */ -#define DLT_JUNIPER_MLPPP 130 -#define DLT_JUNIPER_MLFR 131 -#define DLT_JUNIPER_ES 132 -#define DLT_JUNIPER_GGSN 133 -#define DLT_JUNIPER_MFR 134 -#define DLT_JUNIPER_ATM2 135 -#define DLT_JUNIPER_SERVICES 136 -#define DLT_JUNIPER_ATM1 137 - -/* - * Apple IP-over-IEEE 1394, as per a request from Dieter Siegmund - * <dieter@apple.com>. The header that's presented is an Ethernet-like - * header: - * - * #define FIREWIRE_EUI64_LEN 8 - * struct firewire_header { - * u_char firewire_dhost[FIREWIRE_EUI64_LEN]; - * u_char firewire_shost[FIREWIRE_EUI64_LEN]; - * u_short firewire_type; - * }; - * - * with "firewire_type" being an Ethernet type value, rather than, - * for example, raw GASP frames being handed up. - */ -#define DLT_APPLE_IP_OVER_IEEE1394 138 - -/* - * Various SS7 encapsulations, as per a request from Jeff Morriss - * <jeff.morriss[AT]ulticom.com> and subsequent discussions. - */ -#define DLT_MTP2_WITH_PHDR 139 /* pseudo-header with various info, followed by MTP2 */ -#define DLT_MTP2 140 /* MTP2, without pseudo-header */ -#define DLT_MTP3 141 /* MTP3, without pseudo-header or MTP2 */ -#define DLT_SCCP 142 /* SCCP, without pseudo-header or MTP2 or MTP3 */ - -/* - * DOCSIS MAC frames. - */ -#define DLT_DOCSIS 143 - -/* - * Linux-IrDA packets. Protocol defined at http://www.irda.org. - * Those packets include IrLAP headers and above (IrLMP...), but - * don't include Phy framing (SOF/EOF/CRC & byte stuffing), because Phy - * framing can be handled by the hardware and depend on the bitrate. - * This is exactly the format you would get capturing on a Linux-IrDA - * interface (irdaX), but not on a raw serial port. - * Note the capture is done in "Linux-cooked" mode, so each packet include - * a fake packet header (struct sll_header). This is because IrDA packet - * decoding is dependant on the direction of the packet (incomming or - * outgoing). - * When/if other platform implement IrDA capture, we may revisit the - * issue and define a real DLT_IRDA... - * Jean II - */ -#define DLT_LINUX_IRDA 144 - -/* - * Reserved for IBM SP switch and IBM Next Federation switch. - */ -#define DLT_IBM_SP 145 -#define DLT_IBM_SN 146 - -/* - * Reserved for private use. If you have some link-layer header type - * that you want to use within your organization, with the capture files - * using that link-layer header type not ever be sent outside your - * organization, you can use these values. - * - * No libpcap release will use these for any purpose, nor will any - * tcpdump release use them, either. - * - * Do *NOT* use these in capture files that you expect anybody not using - * your private versions of capture-file-reading tools to read; in - * particular, do *NOT* use them in products, otherwise you may find that - * people won't be able to use tcpdump, or snort, or Ethereal, or... to - * read capture files from your firewall/intrusion detection/traffic - * monitoring/etc. appliance, or whatever product uses that DLT_ value, - * and you may also find that the developers of those applications will - * not accept patches to let them read those files. - * - * Also, do not use them if somebody might send you a capture using them - * for *their* private type and tools using them for *your* private type - * would have to read them. - * - * Instead, ask "tcpdump-workers@lists.tcpdump.org" for a new DLT_ value, - * as per the comment above, and use the type you're given. - */ -#define DLT_USER0 147 -#define DLT_USER1 148 -#define DLT_USER2 149 -#define DLT_USER3 150 -#define DLT_USER4 151 -#define DLT_USER5 152 -#define DLT_USER6 153 -#define DLT_USER7 154 -#define DLT_USER8 155 -#define DLT_USER9 156 -#define DLT_USER10 157 -#define DLT_USER11 158 -#define DLT_USER12 159 -#define DLT_USER13 160 -#define DLT_USER14 161 -#define DLT_USER15 162 - -/* - * For future use with 802.11 captures - defined by AbsoluteValue - * Systems to store a number of bits of link-layer information - * including radio information: - * - * http://www.shaftnet.org/~pizza/software/capturefrm.txt - * - * but it might be used by some non-AVS drivers now or in the - * future. - */ -#define DLT_IEEE802_11_RADIO_AVS 163 /* 802.11 plus AVS radio header */ - -/* - * Juniper-private data link type, as per request from - * Hannes Gredler <hannes@juniper.net>. The DLT_s are used - * for passing on chassis-internal metainformation such as - * QOS profiles, etc.. - */ -#define DLT_JUNIPER_MONITOR 164 - -/* - * Reserved for BACnet MS/TP. - */ -#define DLT_BACNET_MS_TP 165 - -/* - * Another PPP variant as per request from Karsten Keil <kkeil@suse.de>. - * - * This is used in some OSes to allow a kernel socket filter to distinguish - * between incoming and outgoing packets, on a socket intended to - * supply pppd with outgoing packets so it can do dial-on-demand and - * hangup-on-lack-of-demand; incoming packets are filtered out so they - * don't cause pppd to hold the connection up (you don't want random - * input packets such as port scans, packets from old lost connections, - * etc. to force the connection to stay up). - * - * The first byte of the PPP header (0xff03) is modified to accomodate - * the direction - 0x00 = IN, 0x01 = OUT. - */ -#define DLT_PPP_PPPD 166 - -/* - * Names for backwards compatibility with older versions of some PPP - * software; new software should use DLT_PPP_PPPD. - */ -#define DLT_PPP_WITH_DIRECTION DLT_PPP_PPPD -#define DLT_LINUX_PPP_WITHDIRECTION DLT_PPP_PPPD - -/* - * Juniper-private data link type, as per request from - * Hannes Gredler <hannes@juniper.net>. The DLT_s are used - * for passing on chassis-internal metainformation such as - * QOS profiles, cookies, etc.. - */ -#define DLT_JUNIPER_PPPOE 167 -#define DLT_JUNIPER_PPPOE_ATM 168 - -#define DLT_GPRS_LLC 169 /* GPRS LLC */ -#define DLT_GPF_T 170 /* GPF-T (ITU-T G.7041/Y.1303) */ -#define DLT_GPF_F 171 /* GPF-F (ITU-T G.7041/Y.1303) */ - -/* - * Requested by Oolan Zimmer <oz@gcom.com> for use in Gcom's T1/E1 line - * monitoring equipment. - */ -#define DLT_GCOM_T1E1 172 -#define DLT_GCOM_SERIAL 173 - -/* - * Juniper-private data link type, as per request from - * Hannes Gredler <hannes@juniper.net>. The DLT_ is used - * for internal communication to Physical Interface Cards (PIC) - */ -#define DLT_JUNIPER_PIC_PEER 174 - -/* - * Link types requested by Gregor Maier <gregor@endace.com> of Endace - * Measurement Systems. They add an ERF header (see - * http://www.endace.com/support/EndaceRecordFormat.pdf) in front of - * the link-layer header. - */ -#define DLT_ERF_ETH 175 /* Ethernet */ -#define DLT_ERF_POS 176 /* Packet-over-SONET */ - -/* - * Requested by Daniele Orlandi <daniele@orlandi.com> for raw LAPD - * for vISDN (http://www.orlandi.com/visdn/). Its link-layer header - * includes additional information before the LAPD header, so it's - * not necessarily a generic LAPD header. - */ -#define DLT_LINUX_LAPD 177 - -/* - * Juniper-private data link type, as per request from - * Hannes Gredler <hannes@juniper.net>. - * The DLT_ are used for prepending meta-information - * like interface index, interface name - * before standard Ethernet, PPP, Frelay & C-HDLC Frames - */ -#define DLT_JUNIPER_ETHER 178 -#define DLT_JUNIPER_PPP 179 -#define DLT_JUNIPER_FRELAY 180 -#define DLT_JUNIPER_CHDLC 181 - -/* - * Multi Link Frame Relay (FRF.16) - */ -#define DLT_MFR 182 - -/* - * Juniper-private data link type, as per request from - * Hannes Gredler <hannes@juniper.net>. - * The DLT_ is used for internal communication with a - * voice Adapter Card (PIC) - */ -#define DLT_JUNIPER_VP 183 - -/* - * Arinc 429 frames. - * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>. - * Every frame contains a 32bit A429 label. - * More documentation on Arinc 429 can be found at - * http://www.condoreng.com/support/downloads/tutorials/ARINCTutorial.pdf - */ -#define DLT_A429 184 - -/* - * Arinc 653 Interpartition Communication messages. - * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>. - * Please refer to the A653-1 standard for more information. - */ -#define DLT_A653_ICM 185 - -/* - * USB packets, beginning with a USB setup header; requested by - * Paolo Abeni <paolo.abeni@email.it>. - */ -#define DLT_USB 186 - -/* - * Bluetooth HCI UART transport layer (part H:4); requested by - * Paolo Abeni. - */ -#define DLT_BLUETOOTH_HCI_H4 187 - -/* - * IEEE 802.16 MAC Common Part Sublayer; requested by Maria Cruz - * <cruz_petagay@bah.com>. - */ -#define DLT_IEEE802_16_MAC_CPS 188 - -/* - * USB packets, beginning with a Linux USB header; requested by - * Paolo Abeni <paolo.abeni@email.it>. - */ -#define DLT_USB_LINUX 189 - -/* - * Controller Area Network (CAN) v. 2.0B packets. - * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>. - * Used to dump CAN packets coming from a CAN Vector board. - * More documentation on the CAN v2.0B frames can be found at - * http://www.can-cia.org/downloads/?269 - */ -#define DLT_CAN20B 190 - -/* - * IEEE 802.15.4, with address fields padded, as is done by Linux - * drivers; requested by Juergen Schimmer. - */ -#define DLT_IEEE802_15_4_LINUX 191 - -/* - * Per Packet Information encapsulated packets. - * DLT_ requested by Gianluca Varenni <gianluca.varenni@cacetech.com>. - */ -#define DLT_PPI 192 - -/* - * Header for 802.16 MAC Common Part Sublayer plus a radiotap radio header; - * requested by Charles Clancy. - */ -#define DLT_IEEE802_16_MAC_CPS_RADIO 193 - -/* - * Juniper-private data link type, as per request from - * Hannes Gredler <hannes@juniper.net>. - * The DLT_ is used for internal communication with a - * integrated service module (ISM). - */ -#define DLT_JUNIPER_ISM 194 - -/* - * IEEE 802.15.4, exactly as it appears in the spec (no padding, no - * nothing); requested by Mikko Saarnivala <mikko.saarnivala@sensinode.com>. - */ -#define DLT_IEEE802_15_4 195 - -/* - * Various link-layer types, with a pseudo-header, for SITA - * (http://www.sita.aero/); requested by Fulko Hew (fulko.hew@gmail.com). - */ -#define DLT_SITA 196 - -/* - * Various link-layer types, with a pseudo-header, for Endace DAG cards; - * encapsulates Endace ERF records. Requested by Stephen Donnelly - * <stephen@endace.com>. - */ -#define DLT_ERF 197 - -/* - * Special header prepended to Ethernet packets when capturing from a - * u10 Networks board. Requested by Phil Mulholland - * <phil@u10networks.com>. - */ -#define DLT_RAIF1 198 - -/* - * IPMB packet for IPMI, beginning with the I2C slave address, followed - * by the netFn and LUN, etc.. Requested by Chanthy Toeung - * <chanthy.toeung@ca.kontron.com>. - */ -#define DLT_IPMB 199 - -/* - * Juniper-private data link type, as per request from - * Hannes Gredler <hannes@juniper.net>. - * The DLT_ is used for capturing data on a secure tunnel interface. - */ -#define DLT_JUNIPER_ST 200 - -/* - * Bluetooth HCI UART transport layer (part H:4), with pseudo-header - * that includes direction information; requested by Paolo Abeni. - */ -#define DLT_BLUETOOTH_HCI_H4_WITH_PHDR 201 - -/* - * AX.25 packet with a 1-byte KISS header; see - * - * http://www.ax25.net/kiss.htm - * - * as per Richard Stearn <richard@rns-stearn.demon.co.uk>. - */ -#define DLT_AX25_KISS 202 - -/* - * LAPD packets from an ISDN channel, starting with the address field, - * with no pseudo-header. - * Requested by Varuna De Silva <varunax@gmail.com>. - */ -#define DLT_LAPD 203 - -/* - * Variants of various link-layer headers, with a one-byte direction - * pseudo-header prepended - zero means "received by this host", - * non-zero (any non-zero value) means "sent by this host" - as per - * Will Barker <w.barker@zen.co.uk>. - */ -#define DLT_PPP_WITH_DIR 204 /* PPP - don't confuse with DLT_PPP_WITH_DIRECTION */ -#define DLT_C_HDLC_WITH_DIR 205 /* Cisco HDLC */ -#define DLT_FRELAY_WITH_DIR 206 /* Frame Relay */ -#define DLT_LAPB_WITH_DIR 207 /* LAPB */ - -/* - * 208 is reserved for an as-yet-unspecified proprietary link-layer - * type, as requested by Will Barker. - */ - -/* - * IPMB with a Linux-specific pseudo-header; as requested by Alexey Neyman - * <avn@pigeonpoint.com>. - */ -#define DLT_IPMB_LINUX 209 - -/* - * FlexRay automotive bus - http://www.flexray.com/ - as requested - * by Hannes Kaelber <hannes.kaelber@x2e.de>. - */ -#define DLT_FLEXRAY 210 - -/* - * Media Oriented Systems Transport (MOST) bus for multimedia - * transport - http://www.mostcooperation.com/ - as requested - * by Hannes Kaelber <hannes.kaelber@x2e.de>. - */ -#define DLT_MOST 211 - -/* - * Local Interconnect Network (LIN) bus for vehicle networks - - * http://www.lin-subbus.org/ - as requested by Hannes Kaelber - * <hannes.kaelber@x2e.de>. - */ -#define DLT_LIN 212 - -/* - * X2E-private data link type used for serial line capture, - * as requested by Hannes Kaelber <hannes.kaelber@x2e.de>. - */ -#define DLT_X2E_SERIAL 213 - -/* - * X2E-private data link type used for the Xoraya data logger - * family, as requested by Hannes Kaelber <hannes.kaelber@x2e.de>. - */ -#define DLT_X2E_XORAYA 214 - -/* - * IEEE 802.15.4, exactly as it appears in the spec (no padding, no - * nothing), but with the PHY-level data for non-ASK PHYs (4 octets - * of 0 as preamble, one octet of SFD, one octet of frame length+ - * reserved bit, and then the MAC-layer data, starting with the - * frame control field). - * - * Requested by Max Filippov <jcmvbkbc@gmail.com>. - */ -#define DLT_IEEE802_15_4_NONASK_PHY 215 - - -/* - * DLT and savefile link type values are split into a class and - * a member of that class. A class value of 0 indicates a regular - * DLT_/LINKTYPE_ value. - */ -#define DLT_CLASS(x) ((x) & 0x03ff0000) - -/* - * NetBSD-specific generic "raw" link type. The class value indicates - * that this is the generic raw type, and the lower 16 bits are the - * address family we're dealing with. Those values are NetBSD-specific; - * do not assume that they correspond to AF_ values for your operating - * system. - */ -#define DLT_CLASS_NETBSD_RAWAF 0x02240000 -#define DLT_NETBSD_RAWAF(af) (DLT_CLASS_NETBSD_RAWAF | (af)) -#define DLT_NETBSD_RAWAF_AF(x) ((x) & 0x0000ffff) -#define DLT_IS_NETBSD_RAWAF(x) (DLT_CLASS(x) == DLT_CLASS_NETBSD_RAWAF) - - -/* - * The instruction encodings. - */ -/* instruction classes */ -#define BPF_CLASS(code) ((code) & 0x07) -#define BPF_LD 0x00 -#define BPF_LDX 0x01 -#define BPF_ST 0x02 -#define BPF_STX 0x03 -#define BPF_ALU 0x04 -#define BPF_JMP 0x05 -#define BPF_RET 0x06 -#define BPF_MISC 0x07 - -/* ld/ldx fields */ -#define BPF_SIZE(code) ((code) & 0x18) -#define BPF_W 0x00 -#define BPF_H 0x08 -#define BPF_B 0x10 -#define BPF_MODE(code) ((code) & 0xe0) -#define BPF_IMM 0x00 -#define BPF_ABS 0x20 -#define BPF_IND 0x40 -#define BPF_MEM 0x60 -#define BPF_LEN 0x80 -#define BPF_MSH 0xa0 - -/* alu/jmp fields */ -#define BPF_OP(code) ((code) & 0xf0) -#define BPF_ADD 0x00 -#define BPF_SUB 0x10 -#define BPF_MUL 0x20 -#define BPF_DIV 0x30 -#define BPF_OR 0x40 -#define BPF_AND 0x50 -#define BPF_LSH 0x60 -#define BPF_RSH 0x70 -#define BPF_NEG 0x80 -#define BPF_JA 0x00 -#define BPF_JEQ 0x10 -#define BPF_JGT 0x20 -#define BPF_JGE 0x30 -#define BPF_JSET 0x40 -#define BPF_SRC(code) ((code) & 0x08) -#define BPF_K 0x00 -#define BPF_X 0x08 - -/* ret - BPF_K and BPF_X also apply */ -#define BPF_RVAL(code) ((code) & 0x18) -#define BPF_A 0x10 - -/* misc */ -#define BPF_MISCOP(code) ((code) & 0xf8) -#define BPF_TAX 0x00 -#define BPF_TXA 0x80 - -/* - * The instruction data structure. - */ -struct bpf_insn { - u_short code; - u_char jt; - u_char jf; - bpf_u_int32 k; -}; - -/* - * Macros for insn array initializers. - */ -#define BPF_STMT(code, k) { (u_short)(code), 0, 0, k } -#define BPF_JUMP(code, k, jt, jf) { (u_short)(code), jt, jf, k } - -#if __STDC__ || defined(__cplusplus) -extern int bpf_validate(const struct bpf_insn *, int); -extern u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int); -#else -extern int bpf_validate(); -extern u_int bpf_filter(); -#endif - -/* - * Number of scratch memory words (for BPF_LD|BPF_MEM and BPF_ST). - */ -#define BPF_MEMWORDS 16 - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/vs10/include/pcap/namedb.h b/vs10/include/pcap/namedb.h deleted file mode 100644 index 9002c75..0000000 --- a/vs10/include/pcap/namedb.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright (c) 1994, 1996 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the Computer Systems - * Engineering Group at Lawrence Berkeley Laboratory. - * 4. Neither the name of the University nor of the Laboratory may be used - * to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#) $Header: /tcpdump/master/libpcap/pcap/namedb.h,v 1.1 2006/10/04 18:09:22 guy Exp $ (LBL) - */ - -#ifndef lib_pcap_namedb_h -#define lib_pcap_namedb_h - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * As returned by the pcap_next_etherent() - * XXX this stuff doesn't belong in this interface, but this - * library already must do name to address translation, so - * on systems that don't have support for /etc/ethers, we - * export these hooks since they'll - */ -struct pcap_etherent { - u_char addr[6]; - char name[122]; -}; -#ifndef PCAP_ETHERS_FILE -#define PCAP_ETHERS_FILE "/etc/ethers" -#endif -struct pcap_etherent *pcap_next_etherent(FILE *); -u_char *pcap_ether_hostton(const char*); -u_char *pcap_ether_aton(const char *); - -bpf_u_int32 **pcap_nametoaddr(const char *); -#ifdef INET6 -struct addrinfo *pcap_nametoaddrinfo(const char *); -#endif -bpf_u_int32 pcap_nametonetaddr(const char *); - -int pcap_nametoport(const char *, int *, int *); -int pcap_nametoportrange(const char *, int *, int *, int *); -int pcap_nametoproto(const char *); -int pcap_nametoeproto(const char *); -int pcap_nametollc(const char *); -/* - * If a protocol is unknown, PROTO_UNDEF is returned. - * Also, pcap_nametoport() returns the protocol along with the port number. - * If there are ambiguous entried in /etc/services (i.e. domain - * can be either tcp or udp) PROTO_UNDEF is returned. - */ -#define PROTO_UNDEF -1 - -/* XXX move these to pcap-int.h? */ -int __pcap_atodn(const char *, bpf_u_int32 *); -int __pcap_atoin(const char *, bpf_u_int32 *); -u_short __pcap_nametodnaddr(const char *); - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/vs10/include/pcap/pcap.h b/vs10/include/pcap/pcap.h deleted file mode 100644 index ad8fc40..0000000 --- a/vs10/include/pcap/pcap.h +++ /dev/null @@ -1,407 +0,0 @@ -/* -*- Mode: c; tab-width: 8; indent-tabs-mode: 1; c-basic-offset: 8; -*- */ -/* - * Copyright (c) 1993, 1994, 1995, 1996, 1997 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the Computer Systems - * Engineering Group at Lawrence Berkeley Laboratory. - * 4. Neither the name of the University nor of the Laboratory may be used - * to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#) $Header: /tcpdump/master/libpcap/pcap/pcap.h,v 1.4.2.11 2008-10-06 15:38:39 gianluca Exp $ (LBL) - */ - -#ifndef lib_pcap_pcap_h -#define lib_pcap_pcap_h - -#if defined(WIN32) - #include <pcap-stdinc.h> -#elif defined(MSDOS) - #include <sys/types.h> - #include <sys/socket.h> /* u_int, u_char etc. */ -#else /* UN*X */ - #include <sys/types.h> - #include <sys/time.h> -#endif /* WIN32/MSDOS/UN*X */ - -#ifndef PCAP_DONT_INCLUDE_PCAP_BPF_H -#include <pcap/bpf.h> -#endif - -#include <stdio.h> - -#ifdef HAVE_REMOTE - // We have to define the SOCKET here, although it has been defined in sockutils.h - // This is to avoid the distribution of the 'sockutils.h' file around - // (for example in the WinPcap developer's pack) - #ifndef SOCKET - #ifdef WIN32 - #define SOCKET unsigned int - #else - #define SOCKET int - #endif - #endif -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -#define PCAP_VERSION_MAJOR 2 -#define PCAP_VERSION_MINOR 4 - -#define PCAP_ERRBUF_SIZE 256 - -/* - * Compatibility for systems that have a bpf.h that - * predates the bpf typedefs for 64-bit support. - */ -#if BPF_RELEASE - 0 < 199406 -typedef int bpf_int32; -typedef u_int bpf_u_int32; -#endif - -typedef struct pcap pcap_t; -typedef struct pcap_dumper pcap_dumper_t; -typedef struct pcap_if pcap_if_t; -typedef struct pcap_addr pcap_addr_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 32 bit ints so compilers won't insert unwanted - * padding; these files need to be interchangeable across architectures. - * - * Do not change the layout of this structure, in any way (this includes - * changes that only affect the length of fields in this structure). - * - * Also, do not change the interpretation of any of the members of this - * structure, in any way (this includes using values other than - * LINKTYPE_ values, as defined in "savefile.c", in the "linktype" - * field). - * - * Instead: - * - * introduce a new structure for the new format, if the layout - * of the structure changed; - * - * send mail to "tcpdump-workers@lists.tcpdump.org", requesting - * a new magic number for your new capture file format, and, when - * you get the new magic number, put it in "savefile.c"; - * - * use that magic number for save files with the changed file - * header; - * - * make the code in "savefile.c" capable of reading files with - * the old file header as well as files with the new file header - * (using the magic number to determine the header format). - * - * Then supply the changes as a patch at - * - * http://sourceforge.net/projects/libpcap/ - * - * so that future versions of libpcap and programs that use it (such as - * tcpdump) will be able to read your new capture file format. - */ -struct pcap_file_header { - bpf_u_int32 magic; - u_short version_major; - u_short version_minor; - bpf_int32 thiszone; /* gmt to local correction */ - bpf_u_int32 sigfigs; /* accuracy of timestamps */ - bpf_u_int32 snaplen; /* max length saved portion of each pkt */ - bpf_u_int32 linktype; /* data link type (LINKTYPE_*) */ -}; - -/* - * Macros for the value returned by pcap_datalink_ext(). - * - * If LT_FCS_LENGTH_PRESENT(x) is true, the LT_FCS_LENGTH(x) macro - * gives the FCS length of packets in the capture. - */ -#define LT_FCS_LENGTH_PRESENT(x) ((x) & 0x04000000) -#define LT_FCS_LENGTH(x) (((x) & 0xF0000000) >> 28) -#define LT_FCS_DATALINK_EXT(x) ((((x) & 0xF) << 28) | 0x04000000) - -typedef enum { - PCAP_D_INOUT = 0, - PCAP_D_IN, - PCAP_D_OUT -} pcap_direction_t; - -/* - * Generic per-packet information, as supplied by libpcap. - * - * The time stamp can and should be a "struct timeval", regardless of - * whether your system supports 32-bit tv_sec in "struct timeval", - * 64-bit tv_sec in "struct timeval", or both if it supports both 32-bit - * and 64-bit applications. The on-disk format of savefiles uses 32-bit - * tv_sec (and tv_usec); this structure is irrelevant to that. 32-bit - * and 64-bit versions of libpcap, even if they're on the same platform, - * should supply the appropriate version of "struct timeval", even if - * that's not what the underlying packet capture mechanism supplies. - */ -struct pcap_pkthdr { - struct timeval ts; /* time stamp */ - bpf_u_int32 caplen; /* length of portion present */ - bpf_u_int32 len; /* length this packet (off wire) */ -}; - -/* - * As returned by the pcap_stats() - */ -struct pcap_stat { - u_int ps_recv; /* number of packets received */ - u_int ps_drop; /* number of packets dropped */ - u_int ps_ifdrop; /* drops by interface XXX not yet supported */ -#ifdef HAVE_REMOTE - u_int ps_capt; /* number of packets that are received by the application; please get rid off the Win32 ifdef */ - u_int ps_sent; /* number of packets sent by the server on the network */ - u_int ps_netdrop; /* number of packets lost on the network */ -#endif /* HAVE_REMOTE */ -}; - -#ifdef MSDOS -/* - * As returned by the pcap_stats_ex() - */ -struct pcap_stat_ex { - u_long rx_packets; /* total packets received */ - u_long tx_packets; /* total packets transmitted */ - u_long rx_bytes; /* total bytes received */ - u_long tx_bytes; /* total bytes transmitted */ - u_long rx_errors; /* bad packets received */ - u_long tx_errors; /* packet transmit problems */ - u_long rx_dropped; /* no space in Rx buffers */ - u_long tx_dropped; /* no space available for Tx */ - u_long multicast; /* multicast packets received */ - u_long collisions; - - /* detailed rx_errors: */ - u_long rx_length_errors; - u_long rx_over_errors; /* receiver ring buff overflow */ - u_long rx_crc_errors; /* recv'd pkt with crc error */ - u_long rx_frame_errors; /* recv'd frame alignment error */ - u_long rx_fifo_errors; /* recv'r fifo overrun */ - u_long rx_missed_errors; /* recv'r missed packet */ - - /* detailed tx_errors */ - u_long tx_aborted_errors; - u_long tx_carrier_errors; - u_long tx_fifo_errors; - u_long tx_heartbeat_errors; - u_long tx_window_errors; - }; -#endif - -/* - * Item in a list of interfaces. - */ -struct pcap_if { - struct pcap_if *next; - char *name; /* name to hand to "pcap_open_live()" */ - char *description; /* textual description of interface, or NULL */ - struct pcap_addr *addresses; - bpf_u_int32 flags; /* PCAP_IF_ interface flags */ -}; - -#define PCAP_IF_LOOPBACK 0x00000001 /* interface is loopback */ - -/* - * Representation of an interface address. - */ -struct pcap_addr { - struct pcap_addr *next; - struct sockaddr *addr; /* address */ - struct sockaddr *netmask; /* netmask for that address */ - struct sockaddr *broadaddr; /* broadcast address for that address */ - struct sockaddr *dstaddr; /* P2P destination address for that address */ -}; - -typedef void (*pcap_handler)(u_char *, const struct pcap_pkthdr *, - const u_char *); - -/* - * Error codes for the pcap API. - * These will all be negative, so you can check for the success or - * failure of a call that returns these codes by checking for a - * negative value. - */ -#define PCAP_ERROR -1 /* generic error code */ -#define PCAP_ERROR_BREAK -2 /* loop terminated by pcap_breakloop */ -#define PCAP_ERROR_NOT_ACTIVATED -3 /* the capture needs to be activated */ -#define PCAP_ERROR_ACTIVATED -4 /* the operation can't be performed on already activated captures */ -#define PCAP_ERROR_NO_SUCH_DEVICE -5 /* no such device exists */ -#define PCAP_ERROR_RFMON_NOTSUP -6 /* this device doesn't support rfmon (monitor) mode */ -#define PCAP_ERROR_NOT_RFMON -7 /* operation supported only in monitor mode */ -#define PCAP_ERROR_PERM_DENIED -8 /* no permission to open the device */ -#define PCAP_ERROR_IFACE_NOT_UP -9 /* interface isn't up */ - -/* - * Warning codes for the pcap API. - * These will all be positive and non-zero, so they won't look like - * errors. - */ -#define PCAP_WARNING 1 /* generic warning code */ -#define PCAP_WARNING_PROMISC_NOTSUP 2 /* this device doesn't support promiscuous mode */ - -char *pcap_lookupdev(char *); -int pcap_lookupnet(const char *, bpf_u_int32 *, bpf_u_int32 *, char *); - -pcap_t *pcap_create(const char *, char *); -int pcap_set_snaplen(pcap_t *, int); -int pcap_set_promisc(pcap_t *, int); -int pcap_can_set_rfmon(pcap_t *); -int pcap_set_rfmon(pcap_t *, int); -int pcap_set_timeout(pcap_t *, int); -int pcap_set_buffer_size(pcap_t *, int); -int pcap_activate(pcap_t *); - -pcap_t *pcap_open_live(const char *, int, int, int, char *); -pcap_t *pcap_open_dead(int, int); -pcap_t *pcap_open_offline(const char *, char *); -#if defined(WIN32) -pcap_t *pcap_hopen_offline(intptr_t, char *); -#if !defined(LIBPCAP_EXPORTS) -#define pcap_fopen_offline(f,b) \ - pcap_hopen_offline(_get_osfhandle(_fileno(f)), b) -#else /*LIBPCAP_EXPORTS*/ -static pcap_t *pcap_fopen_offline(FILE *, char *); -#endif -#else /*WIN32*/ -pcap_t *pcap_fopen_offline(FILE *, char *); -#endif /*WIN32*/ - -void pcap_close(pcap_t *); -int pcap_loop(pcap_t *, int, pcap_handler, u_char *); -int pcap_dispatch(pcap_t *, int, pcap_handler, u_char *); -const u_char* - pcap_next(pcap_t *, struct pcap_pkthdr *); -int pcap_next_ex(pcap_t *, struct pcap_pkthdr **, const u_char **); -void pcap_breakloop(pcap_t *); -int pcap_stats(pcap_t *, struct pcap_stat *); -int pcap_setfilter(pcap_t *, struct bpf_program *); -int pcap_setdirection(pcap_t *, pcap_direction_t); -int pcap_getnonblock(pcap_t *, char *); -int pcap_setnonblock(pcap_t *, int, char *); -int pcap_inject(pcap_t *, const void *, size_t); -int pcap_sendpacket(pcap_t *, const u_char *, int); -const char *pcap_statustostr(int); -const char *pcap_strerror(int); -char *pcap_geterr(pcap_t *); -void pcap_perror(pcap_t *, char *); -int pcap_compile(pcap_t *, struct bpf_program *, const char *, int, - bpf_u_int32); -int pcap_compile_nopcap(int, int, struct bpf_program *, - const char *, int, bpf_u_int32); -void pcap_freecode(struct bpf_program *); -int pcap_offline_filter(struct bpf_program *, const struct pcap_pkthdr *, - const u_char *); -int pcap_datalink(pcap_t *); -int pcap_datalink_ext(pcap_t *); -int pcap_list_datalinks(pcap_t *, int **); -int pcap_set_datalink(pcap_t *, int); -void pcap_free_datalinks(int *); -int pcap_datalink_name_to_val(const char *); -const char *pcap_datalink_val_to_name(int); -const char *pcap_datalink_val_to_description(int); -int pcap_snapshot(pcap_t *); -int pcap_is_swapped(pcap_t *); -int pcap_major_version(pcap_t *); -int pcap_minor_version(pcap_t *); - -/* XXX */ -FILE *pcap_file(pcap_t *); -int pcap_fileno(pcap_t *); - -pcap_dumper_t *pcap_dump_open(pcap_t *, const char *); -pcap_dumper_t *pcap_dump_fopen(pcap_t *, FILE *fp); -FILE *pcap_dump_file(pcap_dumper_t *); -long pcap_dump_ftell(pcap_dumper_t *); -int pcap_dump_flush(pcap_dumper_t *); -void pcap_dump_close(pcap_dumper_t *); -void pcap_dump(u_char *, const struct pcap_pkthdr *, const u_char *); - -int pcap_findalldevs(pcap_if_t **, char *); -void pcap_freealldevs(pcap_if_t *); - -const char *pcap_lib_version(void); - -/* XXX this guy lives in the bpf tree */ -u_int bpf_filter(const struct bpf_insn *, const u_char *, u_int, u_int); -int bpf_validate(const struct bpf_insn *f, int len); -char *bpf_image(const struct bpf_insn *, int); -void bpf_dump(const struct bpf_program *, int); - -#if defined(WIN32) - -/* - * Win32 definitions - */ - -int pcap_setbuff(pcap_t *p, int dim); -int pcap_setmode(pcap_t *p, int mode); -int pcap_setmintocopy(pcap_t *p, int size); - -#ifdef WPCAP -/* Include file with the wpcap-specific extensions */ -#include <Win32-Extensions.h> -#endif /* WPCAP */ - -#define MODE_CAPT 0 -#define MODE_STAT 1 -#define MODE_MON 2 - -#elif defined(MSDOS) - -/* - * MS-DOS definitions - */ - -int pcap_stats_ex (pcap_t *, struct pcap_stat_ex *); -void pcap_set_wait (pcap_t *p, void (*yield)(void), int wait); -u_long pcap_mac_packets (void); - -#else /* UN*X */ - -/* - * UN*X definitions - */ - -int pcap_get_selectable_fd(pcap_t *); - -#endif /* WIN32/MSDOS/UN*X */ - -#ifdef HAVE_REMOTE -/* Includes most of the public stuff that is needed for the remote capture */ -#include <remote-ext.h> -#endif /* HAVE_REMOTE */ - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/vs10/include/pcap/sll.h b/vs10/include/pcap/sll.h deleted file mode 100644 index e9d5452..0000000 --- a/vs10/include/pcap/sll.h +++ /dev/null @@ -1,129 +0,0 @@ -/*- - * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from the Stanford/CMU enet packet filter, - * (net/enet.c) distributed as part of 4.3BSD, and code contributed - * to Berkeley by Steven McCanne and Van Jacobson both of Lawrence - * Berkeley Laboratory. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#) $Header: /tcpdump/master/libpcap/pcap/sll.h,v 1.2.2.1 2008-05-30 01:36:06 guy Exp $ (LBL) - */ - -/* - * For captures on Linux cooked sockets, we construct a fake header - * that includes: - * - * a 2-byte "packet type" which is one of: - * - * LINUX_SLL_HOST packet was sent to us - * LINUX_SLL_BROADCAST packet was broadcast - * LINUX_SLL_MULTICAST packet was multicast - * LINUX_SLL_OTHERHOST packet was sent to somebody else - * LINUX_SLL_OUTGOING packet was sent *by* us; - * - * a 2-byte Ethernet protocol field; - * - * a 2-byte link-layer type; - * - * a 2-byte link-layer address length; - * - * an 8-byte source link-layer address, whose actual length is - * specified by the previous value. - * - * All fields except for the link-layer address are in network byte order. - * - * DO NOT change the layout of this structure, or change any of the - * LINUX_SLL_ values below. If you must change the link-layer header - * for a "cooked" Linux capture, introduce a new DLT_ type (ask - * "tcpdump-workers@lists.tcpdump.org" for one, so that you don't give it - * a value that collides with a value already being used), and use the - * new header in captures of that type, so that programs that can - * handle DLT_LINUX_SLL captures will continue to handle them correctly - * without any change, and so that capture files with different headers - * can be told apart and programs that read them can dissect the - * packets in them. - */ - -#ifndef lib_pcap_sll_h -#define lib_pcap_sll_h - -/* - * A DLT_LINUX_SLL fake link-layer header. - */ -#define SLL_HDR_LEN 16 /* total header length */ -#define SLL_ADDRLEN 8 /* length of address field */ - -struct sll_header { - u_int16_t sll_pkttype; /* packet type */ - u_int16_t sll_hatype; /* link-layer address type */ - u_int16_t sll_halen; /* link-layer address length */ - u_int8_t sll_addr[SLL_ADDRLEN]; /* link-layer address */ - u_int16_t sll_protocol; /* protocol */ -}; - -/* - * The LINUX_SLL_ values for "sll_pkttype"; these correspond to the - * PACKET_ values on Linux, but are defined here so that they're - * available even on systems other than Linux, and so that they - * don't change even if the PACKET_ values change. - */ -#define LINUX_SLL_HOST 0 -#define LINUX_SLL_BROADCAST 1 -#define LINUX_SLL_MULTICAST 2 -#define LINUX_SLL_OTHERHOST 3 -#define LINUX_SLL_OUTGOING 4 - -/* - * The LINUX_SLL_ values for "sll_protocol"; these correspond to the - * ETH_P_ values on Linux, but are defined here so that they're - * available even on systems other than Linux. We assume, for now, - * that the ETH_P_ values won't change in Linux; if they do, then: - * - * if we don't translate them in "pcap-linux.c", capture files - * won't necessarily be readable if captured on a system that - * defines ETH_P_ values that don't match these values; - * - * if we do translate them in "pcap-linux.c", that makes life - * unpleasant for the BPF code generator, as the values you test - * for in the kernel aren't the values that you test for when - * reading a capture file, so the fixup code run on BPF programs - * handed to the kernel ends up having to do more work. - * - * Add other values here as necessary, for handling packet types that - * might show up on non-Ethernet, non-802.x networks. (Not all the ones - * in the Linux "if_ether.h" will, I suspect, actually show up in - * captures.) - */ -#define LINUX_SLL_P_802_3 0x0001 /* Novell 802.3 frames without 802.2 LLC header */ -#define LINUX_SLL_P_802_2 0x0004 /* 802.2 frames (not D/I/X Ethernet) */ - -#endif diff --git a/vs10/include/pcap/usb.h b/vs10/include/pcap/usb.h deleted file mode 100644 index adcd19c..0000000 --- a/vs10/include/pcap/usb.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright (c) 2006 Paolo Abeni (Italy) - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote - * products derived from this software without specific prior written - * permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * Basic USB data struct - * By Paolo Abeni <paolo.abeni@email.it> - * - * @(#) $Header: /tcpdump/master/libpcap/pcap/usb.h,v 1.6 2007/09/22 02:06:08 guy Exp $ - */ - -#ifndef _PCAP_USB_STRUCTS_H__ -#define _PCAP_USB_STRUCTS_H__ - -/* - * possible transfer mode - */ -#define URB_TRANSFER_IN 0x80 -#define URB_ISOCHRONOUS 0x0 -#define URB_INTERRUPT 0x1 -#define URB_CONTROL 0x2 -#define URB_BULK 0x3 - -/* - * possible event type - */ -#define URB_SUBMIT 'S' -#define URB_COMPLETE 'C' -#define URB_ERROR 'E' - -/* - * USB setup header as defined in USB specification. - * Appears at the front of each packet in DLT_USB captures. - */ -typedef struct _usb_setup { - u_int8_t bmRequestType; - u_int8_t bRequest; - u_int16_t wValue; - u_int16_t wIndex; - u_int16_t wLength; -} pcap_usb_setup; - - -/* - * Header prepended by linux kernel to each event. - * Appears at the front of each packet in DLT_USB_LINUX captures. - */ -typedef struct _usb_header { - u_int64_t id; - u_int8_t event_type; - u_int8_t transfer_type; - u_int8_t endpoint_number; - u_int8_t device_address; - u_int16_t bus_id; - char setup_flag;/*if !=0 the urb setup header is not present*/ - char data_flag; /*if !=0 no urb data is present*/ - int64_t ts_sec; - int32_t ts_usec; - int32_t status; - u_int32_t urb_len; - u_int32_t data_len; /* amount of urb data really present in this event*/ - pcap_usb_setup setup; -} pcap_usb_header; - - -#endif diff --git a/vs10/include/pcap/vlan.h b/vs10/include/pcap/vlan.h deleted file mode 100644 index b0cb794..0000000 --- a/vs10/include/pcap/vlan.h +++ /dev/null @@ -1,46 +0,0 @@ -/*- - * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * @(#) $Header: /tcpdump/master/libpcap/pcap/vlan.h,v 1.1.2.2 2008-08-06 07:45:59 guy Exp $ - */ - -#ifndef lib_pcap_vlan_h -#define lib_pcap_vlan_h - -struct vlan_tag { - u_int16_t vlan_tpid; /* ETH_P_8021Q */ - u_int16_t vlan_tci; /* VLAN TCI */ -}; - -#define VLAN_TAG_LEN 4 - -#endif diff --git a/vs10/include/remote-ext.h b/vs10/include/remote-ext.h deleted file mode 100644 index 9f54d69..0000000 --- a/vs10/include/remote-ext.h +++ /dev/null @@ -1,444 +0,0 @@ -/* - * Copyright (c) 2002 - 2003 - * NetGroup, Politecnico di Torino (Italy) - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the Politecnico di Torino nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - */ - - -#ifndef __REMOTE_EXT_H__ -#define __REMOTE_EXT_H__ - - -#ifndef HAVE_REMOTE -#error Please do not include this file directly. Just define HAVE_REMOTE and then include pcap.h -#endif - -// Definition for Microsoft Visual Studio -#if _MSC_VER > 1000 -#pragma once -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/*! - \file remote-ext.h - - The goal of this file it to include most of the new definitions that should be - placed into the pcap.h file. - - It includes all new definitions (structures and functions like pcap_open(). - Some of the functions are not really a remote feature, but, right now, - they are placed here. -*/ - - - -// All this stuff is public -/*! \addtogroup remote_struct - \{ -*/ - - - - -/*! - \brief Defines the maximum buffer size in which address, port, interface names are kept. - - In case the adapter name or such is larger than this value, it is truncated. - This is not used by the user; however it must be aware that an hostname / interface - name longer than this value will be truncated. -*/ -#define PCAP_BUF_SIZE 1024 - - -/*! \addtogroup remote_source_ID - \{ -*/ - - -/*! - \brief Internal representation of the type of source in use (file, - remote/local interface). - - This indicates a file, i.e. the user want to open a capture from a local file. -*/ -#define PCAP_SRC_FILE 2 -/*! - \brief Internal representation of the type of source in use (file, - remote/local interface). - - This indicates a local interface, i.e. the user want to open a capture from - a local interface. This does not involve the RPCAP protocol. -*/ -#define PCAP_SRC_IFLOCAL 3 -/*! - \brief Internal representation of the type of source in use (file, - remote/local interface). - - This indicates a remote interface, i.e. the user want to open a capture from - an interface on a remote host. This does involve the RPCAP protocol. -*/ -#define PCAP_SRC_IFREMOTE 4 - -/*! - \} -*/ - - - -/*! \addtogroup remote_source_string - - The formats allowed by the pcap_open() are the following: - - file://path_and_filename [opens a local file] - - rpcap://devicename [opens the selected device devices available on the local host, without using the RPCAP protocol] - - rpcap://host/devicename [opens the selected device available on a remote host] - - rpcap://host:port/devicename [opens the selected device available on a remote host, using a non-standard port for RPCAP] - - adaptername [to open a local adapter; kept for compability, but it is strongly discouraged] - - (NULL) [to open the first local adapter; kept for compability, but it is strongly discouraged] - - The formats allowed by the pcap_findalldevs_ex() are the following: - - file://folder/ [lists all the files in the given folder] - - rpcap:// [lists all local adapters] - - rpcap://host:port/ [lists the devices available on a remote host] - - Referring to the 'host' and 'port' paramters, they can be either numeric or literal. Since - IPv6 is fully supported, these are the allowed formats: - - - host (literal): e.g. host.foo.bar - - host (numeric IPv4): e.g. 10.11.12.13 - - host (numeric IPv4, IPv6 style): e.g. [10.11.12.13] - - host (numeric IPv6): e.g. [1:2:3::4] - - port: can be either numeric (e.g. '80') or literal (e.g. 'http') - - Here you find some allowed examples: - - rpcap://host.foo.bar/devicename [everything literal, no port number] - - rpcap://host.foo.bar:1234/devicename [everything literal, with port number] - - rpcap://10.11.12.13/devicename [IPv4 numeric, no port number] - - rpcap://10.11.12.13:1234/devicename [IPv4 numeric, with port number] - - rpcap://[10.11.12.13]:1234/devicename [IPv4 numeric with IPv6 format, with port number] - - rpcap://[1:2:3::4]/devicename [IPv6 numeric, no port number] - - rpcap://[1:2:3::4]:1234/devicename [IPv6 numeric, with port number] - - rpcap://[1:2:3::4]:http/devicename [IPv6 numeric, with literal port number] - - \{ -*/ - - -/*! - \brief String that will be used to determine the type of source in use (file, - remote/local interface). - - This string will be prepended to the interface name in order to create a string - that contains all the information required to open the source. - - This string indicates that the user wants to open a capture from a local file. -*/ -#define PCAP_SRC_FILE_STRING "file://" -/*! - \brief String that will be used to determine the type of source in use (file, - remote/local interface). - - This string will be prepended to the interface name in order to create a string - that contains all the information required to open the source. - - This string indicates that the user wants to open a capture from a network interface. - This string does not necessarily involve the use of the RPCAP protocol. If the - interface required resides on the local host, the RPCAP protocol is not involved - and the local functions are used. -*/ -#define PCAP_SRC_IF_STRING "rpcap://" - -/*! - \} -*/ - - - - - -/*! - \addtogroup remote_open_flags - \{ -*/ - -/*! - \brief Defines if the adapter has to go in promiscuous mode. - - It is '1' if you have to open the adapter in promiscuous mode, '0' otherwise. - Note that even if this parameter is false, the interface could well be in promiscuous - mode for some other reason (for example because another capture process with - promiscuous mode enabled is currently using that interface). - On on Linux systems with 2.2 or later kernels (that have the "any" device), this - flag does not work on the "any" device; if an argument of "any" is supplied, - the 'promisc' flag is ignored. -*/ -#define PCAP_OPENFLAG_PROMISCUOUS 1 - -/*! - \brief Defines if the data trasfer (in case of a remote - capture) has to be done with UDP protocol. - - If it is '1' if you want a UDP data connection, '0' if you want - a TCP data connection; control connection is always TCP-based. - A UDP connection is much lighter, but it does not guarantee that all - the captured packets arrive to the client workstation. Moreover, - it could be harmful in case of network congestion. - This flag is meaningless if the source is not a remote interface. - In that case, it is simply ignored. -*/ -#define PCAP_OPENFLAG_DATATX_UDP 2 - - -/*! - \brief Defines if the remote probe will capture its own generated traffic. - - In case the remote probe uses the same interface to capture traffic and to send - data back to the caller, the captured traffic includes the RPCAP traffic as well. - If this flag is turned on, the RPCAP traffic is excluded from the capture, so that - the trace returned back to the collector is does not include this traffic. -*/ -#define PCAP_OPENFLAG_NOCAPTURE_RPCAP 4 - -/*! - \brief Defines if the local adapter will capture its own generated traffic. - - This flag tells the underlying capture driver to drop the packets that were sent by itself. - This is usefult when building applications like bridges, that should ignore the traffic - they just sent. -*/ -#define PCAP_OPENFLAG_NOCAPTURE_LOCAL 8 - -/*! - \brief This flag configures the adapter for maximum responsiveness. - - In presence of a large value for nbytes, WinPcap waits for the arrival of several packets before - copying the data to the user. This guarantees a low number of system calls, i.e. lower processor usage, - i.e. better performance, which is good for applications like sniffers. If the user sets the - PCAP_OPENFLAG_MAX_RESPONSIVENESS flag, the capture driver will copy the packets as soon as the application - is ready to receive them. This is suggested for real time applications (like, for example, a bridge) - that need the best responsiveness.*/ -#define PCAP_OPENFLAG_MAX_RESPONSIVENESS 16 - -/*! - \} -*/ - - -/*! - \addtogroup remote_samp_methods - \{ -*/ - -/*! - \brief No sampling has to be done on the current capture. - - In this case, no sampling algorithms are applied to the current capture. -*/ -#define PCAP_SAMP_NOSAMP 0 - -/*! - \brief It defines that only 1 out of N packets must be returned to the user. - - In this case, the 'value' field of the 'pcap_samp' structure indicates the - number of packets (minus 1) that must be discarded before one packet got accepted. - In other words, if 'value = 10', the first packet is returned to the caller, while - the following 9 are discarded. -*/ -#define PCAP_SAMP_1_EVERY_N 1 - -/*! - \brief It defines that we have to return 1 packet every N milliseconds. - - In this case, the 'value' field of the 'pcap_samp' structure indicates the 'waiting - time' in milliseconds before one packet got accepted. - In other words, if 'value = 10', the first packet is returned to the caller; the next - returned one will be the first packet that arrives when 10ms have elapsed. -*/ -#define PCAP_SAMP_FIRST_AFTER_N_MS 2 - -/*! - \} -*/ - - -/*! - \addtogroup remote_auth_methods - \{ -*/ - -/*! - \brief It defines the NULL authentication. - - This value has to be used within the 'type' member of the pcap_rmtauth structure. - The 'NULL' authentication has to be equal to 'zero', so that old applications - can just put every field of struct pcap_rmtauth to zero, and it does work. -*/ -#define RPCAP_RMTAUTH_NULL 0 -/*! - \brief It defines the username/password authentication. - - With this type of authentication, the RPCAP protocol will use the username/ - password provided to authenticate the user on the remote machine. If the - authentication is successful (and the user has the right to open network devices) - the RPCAP connection will continue; otherwise it will be dropped. - - This value has to be used within the 'type' member of the pcap_rmtauth structure. -*/ -#define RPCAP_RMTAUTH_PWD 1 - -/*! - \} -*/ - - - - -/*! - - \brief This structure keeps the information needed to autheticate - the user on a remote machine. - - The remote machine can either grant or refuse the access according - to the information provided. - In case the NULL authentication is required, both 'username' and - 'password' can be NULL pointers. - - This structure is meaningless if the source is not a remote interface; - in that case, the functions which requires such a structure can accept - a NULL pointer as well. -*/ -struct pcap_rmtauth -{ - /*! - \brief Type of the authentication required. - - In order to provide maximum flexibility, we can support different types - of authentication based on the value of this 'type' variable. The currently - supported authentication methods are defined into the - \link remote_auth_methods Remote Authentication Methods Section\endlink. - - */ - int type; - /*! - \brief Zero-terminated string containing the username that has to be - used on the remote machine for authentication. - - This field is meaningless in case of the RPCAP_RMTAUTH_NULL authentication - and it can be NULL. - */ - char *username; - /*! - \brief Zero-terminated string containing the password that has to be - used on the remote machine for authentication. - - This field is meaningless in case of the RPCAP_RMTAUTH_NULL authentication - and it can be NULL. - */ - char *password; -}; - - -/*! - \brief This structure defines the information related to sampling. - - In case the sampling is requested, the capturing device should read - only a subset of the packets coming from the source. The returned packets depend - on the sampling parameters. - - \warning The sampling process is applied <strong>after</strong> the filtering process. - In other words, packets are filtered first, then the sampling process selects a - subset of the 'filtered' packets and it returns them to the caller. -*/ -struct pcap_samp -{ - /*! - Method used for sampling. Currently, the supported methods are listed in the - \link remote_samp_methods Sampling Methods Section\endlink. - */ - int method; - - /*! - This value depends on the sampling method defined. For its meaning, please check - at the \link remote_samp_methods Sampling Methods Section\endlink. - */ - int value; -}; - - - - -//! Maximum lenght of an host name (needed for the RPCAP active mode) -#define RPCAP_HOSTLIST_SIZE 1024 - - -/*! - \} -*/ // end of public documentation - - -// Exported functions - - - -/** \name New WinPcap functions - - This section lists the new functions that are able to help considerably in writing - WinPcap programs because of their easiness of use. - */ -//\{ -pcap_t *pcap_open(const char *source, int snaplen, int flags, int read_timeout, struct pcap_rmtauth *auth, char *errbuf); -int pcap_createsrcstr(char *source, int type, const char *host, const char *port, const char *name, char *errbuf); -int pcap_parsesrcstr(const char *source, int *type, char *host, char *port, char *name, char *errbuf); -int pcap_findalldevs_ex(char *source, struct pcap_rmtauth *auth, pcap_if_t **alldevs, char *errbuf); -struct pcap_samp *pcap_setsampling(pcap_t *p); - -//\} -// End of new winpcap functions - - - -/** \name Remote Capture functions - */ -//\{ -SOCKET pcap_remoteact_accept(const char *address, const char *port, const char *hostlist, char *connectinghost, struct pcap_rmtauth *auth, char *errbuf); -int pcap_remoteact_list(char *hostlist, char sep, int size, char *errbuf); -int pcap_remoteact_close(const char *host, char *errbuf); -void pcap_remoteact_cleanup(); -//\} -// End of remote capture functions - -#ifdef __cplusplus -} -#endif - - -#endif - diff --git a/vs10/lib/Packet.lib b/vs10/lib/Packet.lib deleted file mode 100644 index c19383fd9028881f4a2c1e11d1fb34a0b2111e77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8450 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 KZHTccWZM9DkmO$g diff --git a/vs10/lib/libpacket.a b/vs10/lib/libpacket.a deleted file mode 100644 index b9dfc55daf8fe4907f98c90dd982b7ce309ab9d8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20822 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 Y+CfT#w(KEco*m6gC@Ba-4m}M403}+AumAu6 diff --git a/vs10/lib/libwpcap.a b/vs10/lib/libwpcap.a deleted file mode 100644 index f69509891bd78494ef9708d6cbe58a46cd0bce0f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53028 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 diff --git a/vs10/lib/wpcap.lib b/vs10/lib/wpcap.lib deleted file mode 100644 index 28d374d21fdd5f796b3b2523fe6808688fe6b33e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18882 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 Sw5mXTu@I0=h&6{uwg3RL75+{D diff --git a/vs10/lib/x64/Packet.lib b/vs10/lib/x64/Packet.lib deleted file mode 100644 index b3bd00e4336d1fd911024eb89fd5aa1bd970cb54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8290 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 QL?gT85q2R4pOEYV0JI0WfB*mh diff --git a/vs10/lib/x64/wpcap.lib b/vs10/lib/x64/wpcap.lib deleted file mode 100644 index 4fba888ecea6e5220d83a601f5032644c36392ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18466 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 C-haga diff --git a/vs10/masscan.vcxproj b/vs10/masscan.vcxproj index 76d9d43..b6dbb92 100644 --- a/vs10/masscan.vcxproj +++ b/vs10/masscan.vcxproj @@ -85,6 +85,7 @@ <ClCompile Include="..\src\rawsock-getip.c" /> <ClCompile Include="..\src\rawsock-getmac.c" /> <ClCompile Include="..\src\rawsock-getroute.c" /> + <ClCompile Include="..\src\rawsock-pcap.c" /> <ClCompile Include="..\src\rawsock-pcapfile.c" /> <ClCompile Include="..\src\rawsock-pfring.c" /> <ClCompile Include="..\src\rawsock.c" /> @@ -156,6 +157,7 @@ <ClInclude Include="..\src\rand-lcg.h" /> <ClInclude Include="..\src\rand-primegen.h" /> <ClInclude Include="..\src\ranges.h" /> + <ClInclude Include="..\src\rawsock-pcap.h" /> <ClInclude Include="..\src\rawsock-pcapfile.h" /> <ClInclude Include="..\src\rawsock-pfring.h" /> <ClInclude Include="..\src\rawsock.h" /> diff --git a/vs10/masscan.vcxproj.filters b/vs10/masscan.vcxproj.filters index fa37d0b..59268a9 100644 --- a/vs10/masscan.vcxproj.filters +++ b/vs10/masscan.vcxproj.filters @@ -282,6 +282,9 @@ <ClCompile Include="..\src\script-sslv3.c"> <Filter>Source Files\scripts</Filter> </ClCompile> + <ClCompile Include="..\src\rawsock-pcap.c"> + <Filter>Source Files\rawsock</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\src\proto-arp.h"> @@ -482,6 +485,9 @@ <ClInclude Include="..\src\in-report.h"> <Filter>Source Files\output</Filter> </ClInclude> + <ClInclude Include="..\src\rawsock-pcap.h"> + <Filter>Source Files\rawsock</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <None Include="..\README.md" /> -- GitLab