|author||Guy Harris <email@example.com>||2017-05-11 12:57:28 -0700|
|committer||Guy Harris <firstname.lastname@example.org>||2017-05-11 19:58:15 +0000|
Put the HAVE_REMOTE hack into wsutil/wspcap.h, and include that file.
Have a header file that defines HAVE_REMOTE if HAVE_PCAP_REMOTE is defined, and then includes pcap.h. Replace all other includes of pcap.h, and the definition of HAVE_REMOTE, with includes of that file. Check for anything other than wspcap.h including pcap.h in checkAPIs.pl. Change-Id: I3cbee8208944ad6f006f568b3fe3134e10b2a883 Reviewed-on: https://code.wireshark.org/review/21605 Reviewed-by: Guy Harris <email@example.com>
Diffstat (limited to 'wsutil')
2 files changed, 49 insertions, 1 deletions
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am
index 680cf0ea75..a92982d61a 100644
@@ -200,7 +200,8 @@ EXTRA_DIST = \
+ wsgetopt.h \
CLEANFILES = \
diff --git a/wsutil/wspcap.h b/wsutil/wspcap.h
new file mode 100644
@@ -0,0 +1,47 @@
+ * Wrapper around libpcap/WinPcap's pcap.h.
+ * If HAVE_PCAP_REMOTE is defined, it 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.
+ * This bug is fixed in the master branch of libpcap, so any libpcap
+ * release with remote capture support will not have this problem, and
+ * any future WinPcap/NPcap release based on current libpcap code will
+ * not have this problem.
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <firstname.lastname@example.org>
+ * Copyright 2007 Gerald Combs
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#endif /* __WSPCAP_H__ */