From 256378df5cc99a20d843ce623053f83037dc1d0c Mon Sep 17 00:00:00 2001 From: dmiller Date: Wed, 19 Apr 2017 18:18:38 +0000 Subject: [PATCH] Fix up some more header includes --- nmap.h | 2 -- nse_debug.cc | 3 ++- service_scan.h | 7 ++++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nmap.h b/nmap.h index e896249b7c..7a0d311136 100644 --- a/nmap.h +++ b/nmap.h @@ -232,8 +232,6 @@ #define MAX_DECOYS 128 /* How many decoys are allowed? */ -#define MAXFALLBACKS 20 /* How many comma separated fallbacks are allowed in the service-probes file? */ - /* TCP Options for TCP SYN probes: MSS 1460 */ #define TCP_SYN_PROBE_OPTIONS "\x02\x04\x05\xb4" #define TCP_SYN_PROBE_OPTIONS_LEN (sizeof(TCP_SYN_PROBE_OPTIONS)-1) diff --git a/nse_debug.cc b/nse_debug.cc index f15f88fdce..f9df13cccc 100644 --- a/nse_debug.cc +++ b/nse_debug.cc @@ -4,9 +4,10 @@ extern "C" { #include "lauxlib.h" } -#include "nmap.h" #include "nse_debug.h" #include "output.h" +#undef NDEBUG +#include /* Print a Lua table. depth_limit is the limit on recursive printing of subtables. */ diff --git a/service_scan.h b/service_scan.h index 9268d49ca6..e132490ff7 100644 --- a/service_scan.h +++ b/service_scan.h @@ -135,7 +135,7 @@ #define SERVICE_SCAN_H #include "portlist.h" -#include "nmap.h" +#include "scan_lists.h" #include @@ -145,12 +145,17 @@ # include #endif +#undef NDEBUG +#include + /********************** DEFINES/ENUMS ***********************************/ #define DEFAULT_SERVICEWAITMS 5000 #define DEFAULT_TCPWRAPPEDMS 2000 // connections closed after this timeout are not considered "tcpwrapped" #define DEFAULT_CONNECT_TIMEOUT 5000 #define DEFAULT_CONNECT_SSL_TIMEOUT 8000 // includes connect() + ssl negotiation #define SERVICEMATCH_REGEX 1 +#define MAXFALLBACKS 20 /* How many comma separated fallbacks are allowed in the service-probes file? */ + // #define SERVICEMATCH_STATIC 2 -- no longer supported /********************** STRUCTURES ***********************************/