CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-05-13 16:57:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Avoid macro redefinition and WinPcap incompatibility now that Npcap defines PCAP_NETMASK_UNKNOWN

Browse source
This commit is contained in:
dmiller 2016-08-18 23:53:46 +00:00
parent 265e32dbd6
commit ed59a3d370
4 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
nmap_winconfig.h
View file

@ -142,8 +142,5 @@
#define DNET_INCLUDED 1
#define PCRE_INCLUDED 1
/* WinPCAP doesn't have this */
#define PCAP_NETMASK_UNKNOWN 0
#endif /* NMAP_WINCONFIG_H */

2
nsock/include/nsock_winconfig.h
View file

@ -95,8 +95,6 @@
#ifndef DISABLE_NSOCK_PCAP
#define HAVE_PCAP 1
/* WinPCAP doesn't have this */
#define PCAP_NETMASK_UNKNOWN 0
#endif
/* Need this for _WIN32_WINNT below */

6
nsock/src/nsock_pcap.h
View file

@ -66,6 +66,12 @@
#include <string.h>
#include <stdarg.h>
#ifdef WIN32
/* WinPCAP doesn't have this, but Npcap does.
* Using 0 is safe for both, but change this if we decide to drop WinPcap */
#undef PCAP_NETMASK_UNKNOWN
#define PCAP_NETMASK_UNKNOWN 0
#endif
/*
* There are three possible ways to read packets from pcap descriptor:

6
tcpip.h
View file

@ -131,6 +131,12 @@
#include "nbase.h"
#include <pcap.h>
#ifdef WIN32
/* WinPCAP doesn't have this, but Npcap does.
* Using 0 is safe for both, but change this if we decide to drop WinPcap */
#undef PCAP_NETMASK_UNKNOWN
#define PCAP_NETMASK_UNKNOWN 0
#endif
class Target;