Force HAVE_REMOTE to be defined when including pcap.h with remote support.

WinPcap made the mistake of having stuff in its public header fines
depend on a configuration #define, HAVE_REMOTE; this means that we need
to forcibly define it when building with remote capture support.

The tip of the libpcap master branch does not have that botch; hopefully
future versions of libpcap-for-Windows will be based on that libpcap and
thus lack that botch as well.

Defining HAVE_REMOTE in config.h is not the right fix, as it makes it
look like a *Wireshark* configuration option that code in Wireshark
should test, rather than a *WinPcap* configuration option that the
pcap.h that ships with the WinPcap SDK should have been changed, as part
of the build process, to correctly define or not, so that users of
WinPcap don't have to define it themselves.

Change-Id: I62d1eca6d3c900d0dcc9fbc011db77f595a86313
Reviewed-on: https://code.wireshark.org/review/21593
Reviewed-by: Guy Harris <guy@alum.mit.edu>

diff --git a/caputils/capture-pcap-util-unix.c b/caputils/capture-pcap-util-unix.c
index 362317e914cc9d2447f1afecab15623d6f048dac..5d57a02797d144b0d63747e52dd63d4307ee8c78 100644 (file)
--- a/caputils/capture-pcap-util-unix.c
+++ b/caputils/capture-pcap-util-unix.c
@@ -26,6 +26,18 @@
 
 #ifdef HAVE_LIBPCAP
 
+#ifdef HAVE_PCAP_REMOTE
+/*
+ * Force the WinPcap header files to define things required for remote
+ * capture.  (Yes, this is q WinPcap bug; if your project has a public
+ * header file that checks or otherwise uses a #define that's defined
+ * by your project's configuration process, and don't ensure that
+ * it's always defined appropriately when that header file is included,
+ * before its first use, you have made a mistake.)
+ */
+#define HAVE_REMOTE
+#endif
+
 #include <pcap.h>
 
 #ifdef __APPLE__

diff --git a/caputils/capture-pcap-util.h b/caputils/capture-pcap-util.h
index a5c3825900ab4ac642d195c6a2c68b860bb04e0c..87a05e8283e157af97bddd1246b47306887d5bd9 100644 (file)
--- a/caputils/capture-pcap-util.h
+++ b/caputils/capture-pcap-util.h
@@ -29,6 +29,18 @@ extern "C" {
 
 #ifdef HAVE_LIBPCAP
 
+#ifdef HAVE_PCAP_REMOTE
+/*
+ * Force the WinPcap header files to define things required for remote
+ * capture.  (Yes, this is q WinPcap bug; if your project has a public
+ * header file that checks or otherwise uses a #define that's defined
+ * by your project's configuration process, and don't ensure that
+ * it's always defined appropriately when that header file is included,
+ * before its first use, you have made a mistake.)
+ */
+#define HAVE_REMOTE
+#endif
+
 #include <pcap.h>
 
 #include "capture_opts.h"

diff --git a/caputils/capture_wpcap_packet.c b/caputils/capture_wpcap_packet.c
index 5b3ffc479d3f4cfb0bfc78eb6ec0a820c39f2f9e..6d1b77cb11e9c9cdd32ab75fbca280ead5bda325 100644 (file)
--- a/caputils/capture_wpcap_packet.c
+++ b/caputils/capture_wpcap_packet.c
@@ -30,6 +30,18 @@
 #include <glib.h>
 #include <gmodule.h>
 
+#ifdef HAVE_PCAP_REMOTE
+/*
+ * Force the WinPcap header files to define things required for remote
+ * capture.  (Yes, this is q WinPcap bug; if your project has a public
+ * header file that checks or otherwise uses a #define that's defined
+ * by your project's configuration process, and don't ensure that
+ * it's always defined appropriately when that header file is included,
+ * before its first use, you have made a mistake.)
+ */
+#define HAVE_REMOTE
+#endif
+
 #include <pcap.h>
 
 /* XXX - yes, I know, I should move cppmagic.h to a generic location. */

diff --git a/extcap/androiddump.c b/extcap/androiddump.c
index d5a267e9547fb7088275016e62484eaa61ca0090..00cc0e03fbdb3031db3d1c03130f84c4d4c0b2b6 100644 (file)
--- a/extcap/androiddump.c
+++ b/extcap/androiddump.c
@@ -65,6 +65,18 @@
 #define PCAP_RECORD_HEADER_LENGTH              16
 
 #ifdef ANDROIDDUMP_USE_LIBPCAP
+    #ifdef HAVE_PCAP_REMOTE
+    /*
+     * Force the WinPcap header files to define things required for remote
+     * capture.  (Yes, this is q WinPcap bug; if your project has a public
+     * header file that checks or otherwise uses a #define that's defined
+     * by your project's configuration process, and don't ensure that
+     * it's always defined appropriately when that header file is included,
+     * before its first use, you have made a mistake.)
+     */
+    #define HAVE_REMOTE
+    #endif
+
     #include <pcap.h>
     #include <pcap-bpf.h>
     #include <pcap/bluetooth.h>

diff --git a/ringbuffer.c b/ringbuffer.c
index 0ba365c25f2a44247f7af8f37c46d7707e1c8380..51a1a2ff6bcb7a20622e7897db016c3f1b5e4f01 100644 (file)
--- a/ringbuffer.c
+++ b/ringbuffer.c
@@ -49,6 +49,18 @@
 #include <time.h>
 #include <errno.h>
 
+#ifdef HAVE_PCAP_REMOTE
+/*
+ * Force the WinPcap header files to define things required for remote
+ * capture.  (Yes, this is q WinPcap bug; if your project has a public
+ * header file that checks or otherwise uses a #define that's defined
+ * by your project's configuration process, and don't ensure that
+ * it's always defined appropriately when that header file is included,
+ * before its first use, you have made a mistake.)
+ */
+#define HAVE_REMOTE
+#endif
+
 #include <pcap.h>
 
 #include <glib.h>

diff --git a/trigcap.c b/trigcap.c
index c0779584d68d21e3ca12732e5d447976445bf520..3c14c6a37e9d58adbba2ea292f5105edabda680c 100644 (file)
--- a/trigcap.c
+++ b/trigcap.c
@@ -27,6 +27,19 @@
 #include <signal.h>
 #include <errno.h>
 #include <getopt.h>
+
+#ifdef HAVE_PCAP_REMOTE
+/*
+ * Force the WinPcap header files to define things required for remote
+ * capture.  (Yes, this is q WinPcap bug; if your project has a public
+ * header file that checks or otherwise uses a #define that's defined
+ * by your project's configuration process, and don't ensure that
+ * it's always defined appropriately when that header file is included,
+ * before its first use, you have made a mistake.)
+ */
+#define HAVE_REMOTE
+#endif
+
 #include <pcap.h>
 
 static int dumping;

diff --git a/ui/gtk/airpcap_dlg.c b/ui/gtk/airpcap_dlg.c
index b3660b387f2aac06576a314e0d08de91a35918cd..b02034c2db877f3bff1f415c17fab8b0cc7aad6f 100644 (file)
--- a/ui/gtk/airpcap_dlg.c
+++ b/ui/gtk/airpcap_dlg.c
@@ -35,6 +35,18 @@
 #include <epan/prefs.h>
 #include <epan/crypt/wep-wpadefs.h>
 
+#ifdef HAVE_PCAP_REMOTE
+/*
+ * Force the WinPcap header files to define things required for remote
+ * capture.  (Yes, this is q WinPcap bug; if your project has a public
+ * header file that checks or otherwise uses a #define that's defined
+ * by your project's configuration process, and don't ensure that
+ * it's always defined appropriately when that header file is included,
+ * before its first use, you have made a mistake.)
+ */
+#define HAVE_REMOTE
+#endif
+
 #include <pcap.h>
 
 #include "ui/simple_dialog.h"

diff --git a/ui/qt/capture_filter_syntax_worker.cpp b/ui/qt/capture_filter_syntax_worker.cpp
index 9f6ae0cc1caad62283311c0eea828e9a292c1798..a296f89c51ca006109279ed31e7b5683bb545baa 100644 (file)
--- a/ui/qt/capture_filter_syntax_worker.cpp
+++ b/ui/qt/capture_filter_syntax_worker.cpp
@@ -23,7 +23,21 @@
 
 #ifdef HAVE_LIBPCAP
 #include <glib.h>
+
+#ifdef HAVE_PCAP_REMOTE
+/*
+ * Force the WinPcap header files to define things required for remote
+ * capture.  (Yes, this is q WinPcap bug; if your project has a public
+ * header file that checks or otherwise uses a #define that's defined
+ * by your project's configuration process, and don't ensure that
+ * it's always defined appropriately when that header file is included,
+ * before its first use, you have made a mistake.)
+ */
+#define HAVE_REMOTE
+#endif
+
 #include <pcap.h>
+
 #include "capture_opts.h"
 #include "ui/capture_globals.h"
 #endif

diff --git a/ui/qt/compiled_filter_output.cpp b/ui/qt/compiled_filter_output.cpp
index 67c5f64daa0902f8cb153df19afb780b5158be2c..c78ab713acabb5d1a61d8de1e93250ce88b66a76 100644 (file)
--- a/ui/qt/compiled_filter_output.cpp
+++ b/ui/qt/compiled_filter_output.cpp
@@ -23,6 +23,18 @@
 #include <ui_compiled_filter_output.h>
 #include "compiled_filter_output.h"
 
+#ifdef HAVE_PCAP_REMOTE
+/*
+ * Force the WinPcap header files to define things required for remote
+ * capture.  (Yes, this is q WinPcap bug; if your project has a public
+ * header file that checks or otherwise uses a #define that's defined
+ * by your project's configuration process, and don't ensure that
+ * it's always defined appropriately when that header file is included,
+ * before its first use, you have made a mistake.)
+ */
+#define HAVE_REMOTE
+#endif
+
 #include <pcap.h>
 
 #include "capture_opts.h"