diff options
| author | Sake Blok <sake@euronet.nl> | 2010-10-03 22:42:27 +0000 |
|---|---|---|
| committer | Sake Blok <sake@euronet.nl> | 2010-10-03 22:42:27 +0000 |
| commit | 6c97a708c9be0552781bce8528a2980f66b49b20 (patch) | |
| tree | a9030a233202caa17b8f14c9616ee22aea7d7924 | |
| parent | 95a48cd20859ff8d32fb33d2e3a9eb57ad4bdb29 (diff) | |
| download | wireshark-6c97a708c9be0552781bce8528a2980f66b49b20.tar.gz wireshark-6c97a708c9be0552781bce8528a2980f66b49b20.tar.bz2 wireshark-6c97a708c9be0552781bce8528a2980f66b49b20.zip | |
Make "bpf_image" available on Windows. This enables the "Compile BPF" button and "dumpcap -d" on Windows.
svn path=/trunk/; revision=34357
| -rw-r--r-- | Makefile.nmake | 1 | ||||
| -rw-r--r-- | capture-wpcap.c | 2 | ||||
| -rw-r--r-- | config.h.win32 | 1 | ||||
| -rw-r--r-- | config.nmake | 2 |
4 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 34858697ca..b58232227b 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -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)/" \ diff --git a/capture-wpcap.c b/capture-wpcap.c index d081fa657b..9da61f9ab4 100644 --- a/capture-wpcap.c +++ b/capture-wpcap.c @@ -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) { diff --git a/config.h.win32 b/config.h.win32 index 98e76c411c..688d9076f7 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -64,6 +64,7 @@ @HAVE_PCAP_REMOTE@ @HAVE_PCAP_OPEN@ @HAVE_PCAP_OPEN_DEAD@ +@HAVE_BPF_IMAGE@ @HAVE_PCAP_SETSAMPLING@ @HAVE_AIRPCAP@ diff --git a/config.nmake b/config.nmake index 89b7312aea..6239af36d5 100644 --- a/config.nmake +++ b/config.nmake @@ -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) |