Make "bpf_image" available on Windows. This enables the "Compile BPF" button and "dumpcap -d" on Windows.

svn path=/trunk/; revision=34357
This commit is contained in:
Sake Blok 2010-10-03 22:42:27 +00:00
parent 95a48cd208
commit 6c97a708c9
4 changed files with 5 additions and 1 deletions

View File

@ -374,6 +374,7 @@ config.h : config.h.win32 config.nmake
-e "s/@HAVE_PCAP_FREE_DATALINKS@/$(PCAP_FREE_DATALINKS_CONFIG)/" \
-e "s/@HAVE_PCAP_SET_DATALINK@/$(PCAP_SET_DATALINK_CONFIG)/" \
-e "s/@HAVE_PCAP_SETSAMPLING@/$(PCAP_SETSAMPLING_CONFIG)/" \
-e "s/@HAVE_BPF_IMAGE@/$(BPF_IMAGE_CONFIG)/" \
-e "s/@HAVE_LIBWIRESHARKDLL@/$(LIBWIRESHARK_CONFIG)/" \
-e "s/@HAVE_LIBGNUTLS@/$(GNUTLS_CONFIG)/" \
-e "s/@HAVE_LIBGCRYPT@/$(LIBGCRYPT_CONFIG)/" \

View File

@ -341,7 +341,7 @@ pcap_open_dead(int a, int b)
#endif
#ifdef HAVE_BPF_IMAGE
static char *
char *
bpf_image(const struct bpf_insn *a, int b)
{
if (!has_wpcap) {

View File

@ -64,6 +64,7 @@
@HAVE_PCAP_REMOTE@
@HAVE_PCAP_OPEN@
@HAVE_PCAP_OPEN_DEAD@
@HAVE_BPF_IMAGE@
@HAVE_PCAP_SETSAMPLING@
@HAVE_AIRPCAP@

View File

@ -1034,6 +1034,7 @@ PCAP_LIST_DATALINKS_CONFIG=^#define HAVE_PCAP_LIST_DATALINKS 1
PCAP_FREE_DATALINKS_CONFIG=^#define HAVE_PCAP_FREE_DATALINKS 1
PCAP_SET_DATALINK_CONFIG=^#define HAVE_PCAP_SET_DATALINK 1
PCAP_OPEN_DEAD_CONFIG=^#define HAVE_PCAP_OPEN_DEAD 1
BPF_IMAGE_CONFIG=^#define HAVE_BPF_IMAGE 1
!ELSE
# no WpdPack installed
WINPCAP_CONFIG=
@ -1046,6 +1047,7 @@ PCAP_LIST_DATALINKS_CONFIG=
PCAP_FREE_DATALINKS_CONFIG=
PCAP_SET_DATALINK_CONFIG=
PCAP_OPEN_DEAD_CONFIG=
BPF_IMAGE_CONFIG=
!ENDIF
!IF DEFINED(PCAP_DIR) && DEFINED(PCAP_REMOTE)