diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-05-11 12:57:28 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-05-11 19:58:15 +0000 |
| commit | 7321183716f1e6e28584ea356b0782b06f330fe5 (patch) | |
| tree | 304dbc6154a841e2dc35262735425f481f7d3efb /wsutil | |
| parent | 6f1e6d24c64960bf347c1990fcca8dfdaaf44c68 (diff) | |
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 <guy@alum.mit.edu>
Diffstat (limited to 'wsutil')
| -rw-r--r-- | wsutil/Makefile.am | 3 | ||||
| -rw-r--r-- | wsutil/wspcap.h | 47 |
2 files changed, 49 insertions, 1 deletions
diff --git a/wsutil/Makefile.am b/wsutil/Makefile.am index 680cf0ea75..a92982d61a 100644 --- a/wsutil/Makefile.am +++ b/wsutil/Makefile.am @@ -200,7 +200,8 @@ EXTRA_DIST = \ win32-utils.h \ ws_mempbrk_sse42.c \ wsgcrypt.h \ - wsgetopt.h + wsgetopt.h \ + wspcap.h CLEANFILES = \ libwsutil.a \ diff --git a/wsutil/wspcap.h b/wsutil/wspcap.h new file mode 100644 index 0000000000..f6bb0dd71a --- /dev/null +++ b/wsutil/wspcap.h @@ -0,0 +1,47 @@ +/* wspcap.h + * + * 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 <gerald@wireshark.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. + */ + +#ifndef __WSPCAP_H__ +#define __WSPCAP_H__ + +#ifdef HAVE_PCAP_REMOTE +#define HAVE_REMOTE +#endif + +#include <pcap.h> + +#endif /* __WSPCAP_H__ */ |