diff --git a/Makefile.in b/Makefile.in
index 615980fb0..cd1f85f79 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -114,7 +114,7 @@ endif
export SRCS = charpool.cc FingerPrintResults.cc FPEngine.cc FPModel.cc idle_scan.cc MACLookup.cc main.cc nmap.cc nmap_dns.cc nmap_error.cc nmap_ftp.cc NmapOps.cc NmapOutputTable.cc nmap_tty.cc osscan2.cc osscan.cc output.cc payload.cc portlist.cc portreasons.cc protocols.cc scan_engine.cc scan_engine_connect.cc scan_engine_raw.cc scan_lists.cc service_scan.cc services.cc Target.cc NewTargets.cc TargetGroup.cc targets.cc tcpip.cc timing.cc traceroute.cc utils.cc xml.cc $(NSE_SRC)
-export HDRS = charpool.h FingerPrintResults.h FPEngine.h idle_scan.h MACLookup.h nmap_amigaos.h nmap_dns.h nmap_error.h nmap.h nmap_ftp.h NmapOps.h NmapOutputTable.h nmap_tty.h nmap_winconfig.h osscan2.h osscan.h output.h payload.h portlist.h portreasons.h protocols.h scan_engine.h scan_engine_connect.h scan_engine_raw.h service_scan.h scan_lists.h services.h NewTargets.h TargetGroup.h Target.h targets.h tcpip.h timing.h traceroute.h utils.h xml.h $(NSE_HDRS)
+export HDRS = charpool.h FingerPrintResults.h FPEngine.h idle_scan.h MACLookup.h nmap_amigaos.h nmap_dns.h nmap_error.h nmap.h nmap_ftp.h NmapOps.h NmapOutputTable.h nmap_tty.h nmap_winconfig.h osscan2.h osscan.h output.h payload.h portlist.h portreasons.h probespec.h protocols.h scan_engine.h scan_engine_connect.h scan_engine_raw.h service_scan.h scan_lists.h services.h NewTargets.h TargetGroup.h Target.h targets.h tcpip.h timing.h traceroute.h utils.h xml.h $(NSE_HDRS)
OBJS = charpool.o FingerPrintResults.o FPEngine.o FPModel.o idle_scan.o MACLookup.o nmap_dns.o nmap_error.o nmap.o nmap_ftp.o NmapOps.o NmapOutputTable.o nmap_tty.o osscan2.o osscan.o output.o payload.o portlist.o portreasons.o protocols.o scan_engine.o scan_engine_connect.o scan_engine_raw.o scan_lists.o service_scan.o services.o NewTargets.o TargetGroup.o Target.o targets.o tcpip.o timing.o traceroute.o utils.o xml.o $(NSE_OBJS)
diff --git a/Target.h b/Target.h
index 2fd28f9cb..48fda5523 100644
--- a/Target.h
+++ b/Target.h
@@ -144,7 +144,7 @@
#include "portreasons.h"
#include "portlist.h"
-#include "scan_engine.h"
+#include "probespec.h"
#include "osscan.h"
#include "osscan2.h"
class FingerPrintResults;
diff --git a/mswin32/nmap.vcxproj b/mswin32/nmap.vcxproj
index a3abbc6b7..0b2a4b010 100644
--- a/mswin32/nmap.vcxproj
+++ b/mswin32/nmap.vcxproj
@@ -231,6 +231,7 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje
+
diff --git a/probespec.h b/probespec.h
new file mode 100644
index 000000000..797dcc27f
--- /dev/null
+++ b/probespec.h
@@ -0,0 +1,185 @@
+#ifndef PROBESPEC_H
+#define PROBESPEC_H
+/***************************************************************************
+ * probespec.h -- Defines structures which specify probes to network ports *
+ * and protocols. *
+ ***********************IMPORTANT NMAP LICENSE TERMS************************
+ * *
+ * The Nmap Security Scanner is (C) 1996-2018 Insecure.Com LLC ("The Nmap *
+ * Project"). Nmap is also a registered trademark of the Nmap Project. *
+ * This program is free software; you may redistribute and/or modify it *
+ * under the terms of the GNU General Public License as published by the *
+ * Free Software Foundation; Version 2 ("GPL"), BUT ONLY WITH ALL OF THE *
+ * CLARIFICATIONS AND EXCEPTIONS DESCRIBED HEREIN. This guarantees your *
+ * right to use, modify, and redistribute this software under certain *
+ * conditions. If you wish to embed Nmap technology into proprietary *
+ * software, we sell alternative licenses (contact sales@nmap.com). *
+ * Dozens of software vendors already license Nmap technology such as *
+ * host discovery, port scanning, OS detection, version detection, and *
+ * the Nmap Scripting Engine. *
+ * *
+ * Note that the GPL places important restrictions on "derivative works", *
+ * yet it does not provide a detailed definition of that term. To avoid *
+ * misunderstandings, we interpret that term as broadly as copyright law *
+ * allows. For example, we consider an application to constitute a *
+ * derivative work for the purpose of this license if it does any of the *
+ * following with any software or content covered by this license *
+ * ("Covered Software"): *
+ * *
+ * o Integrates source code from Covered Software. *
+ * *
+ * o Reads or includes copyrighted data files, such as Nmap's nmap-os-db *
+ * or nmap-service-probes. *
+ * *
+ * o Is designed specifically to execute Covered Software and parse the *
+ * results (as opposed to typical shell or execution-menu apps, which will *
+ * execute anything you tell them to). *
+ * *
+ * o Includes Covered Software in a proprietary executable installer. The *
+ * installers produced by InstallShield are an example of this. Including *
+ * Nmap with other software in compressed or archival form does not *
+ * trigger this provision, provided appropriate open source decompression *
+ * or de-archiving software is widely available for no charge. For the *
+ * purposes of this license, an installer is considered to include Covered *
+ * Software even if it actually retrieves a copy of Covered Software from *
+ * another source during runtime (such as by downloading it from the *
+ * Internet). *
+ * *
+ * o Links (statically or dynamically) to a library which does any of the *
+ * above. *
+ * *
+ * o Executes a helper program, module, or script to do any of the above. *
+ * *
+ * This list is not exclusive, but is meant to clarify our interpretation *
+ * of derived works with some common examples. Other people may interpret *
+ * the plain GPL differently, so we consider this a special exception to *
+ * the GPL that we apply to Covered Software. Works which meet any of *
+ * these conditions must conform to all of the terms of this license, *
+ * particularly including the GPL Section 3 requirements of providing *
+ * source code and allowing free redistribution of the work as a whole. *
+ * *
+ * As another special exception to the GPL terms, the Nmap Project grants *
+ * permission to link the code of this program with any version of the *
+ * OpenSSL library which is distributed under a license identical to that *
+ * listed in the included docs/licenses/OpenSSL.txt file, and distribute *
+ * linked combinations including the two. *
+ * *
+ * The Nmap Project has permission to redistribute Npcap, a packet *
+ * capturing driver and library for the Microsoft Windows platform. *
+ * Npcap is a separate work with it's own license rather than this Nmap *
+ * license. Since the Npcap license does not permit redistribution *
+ * without special permission, our Nmap Windows binary packages which *
+ * contain Npcap may not be redistributed without special permission. *
+ * *
+ * Any redistribution of Covered Software, including any derived works, *
+ * must obey and carry forward all of the terms of this license, including *
+ * obeying all GPL rules and restrictions. For example, source code of *
+ * the whole work must be provided and free redistribution must be *
+ * allowed. All GPL references to "this License", are to be treated as *
+ * including the terms and conditions of this license text as well. *
+ * *
+ * Because this license imposes special exceptions to the GPL, Covered *
+ * Work may not be combined (even as part of a larger work) with plain GPL *
+ * software. The terms, conditions, and exceptions of this license must *
+ * be included as well. This license is incompatible with some other open *
+ * source licenses as well. In some cases we can relicense portions of *
+ * Nmap or grant special permissions to use it in other open source *
+ * software. Please contact fyodor@nmap.org with any such requests. *
+ * Similarly, we don't incorporate incompatible open source software into *
+ * Covered Software without special permission from the copyright holders. *
+ * *
+ * If you have any questions about the licensing restrictions on using *
+ * Nmap in other works, we are happy to help. As mentioned above, we also *
+ * offer an alternative license to integrate Nmap into proprietary *
+ * applications and appliances. These contracts have been sold to dozens *
+ * of software vendors, and generally include a perpetual license as well *
+ * as providing support and updates. They also fund the continued *
+ * development of Nmap. Please email sales@nmap.com for further *
+ * information. *
+ * *
+ * If you have received a written license agreement or contract for *
+ * Covered Software stating terms other than these, you may choose to use *
+ * and redistribute Covered Software under those terms instead of these. *
+ * *
+ * Source is provided to this software because we believe users have a *
+ * right to know exactly what a program is going to do before they run it. *
+ * This also allows you to audit the software for security holes. *
+ * *
+ * Source code also allows you to port Nmap to new platforms, fix bugs, *
+ * and add new features. You are highly encouraged to send your changes *
+ * to the dev@nmap.org mailing list for possible incorporation into the *
+ * main distribution. By sending these changes to Fyodor or one of the *
+ * Insecure.Org development mailing lists, or checking them into the Nmap *
+ * source code repository, it is understood (unless you specify *
+ * otherwise) that you are offering the Nmap Project the unlimited, *
+ * non-exclusive right to reuse, modify, and relicense the code. Nmap *
+ * will always be available Open Source, but this is important because *
+ * the inability to relicense code has caused devastating problems for *
+ * other Free Software projects (such as KDE and NASM). We also *
+ * occasionally relicense the code to third parties as discussed above. *
+ * If you wish to specify special license conditions of your *
+ * contributions, just say so when you send them. *
+ * *
+ * 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 Nmap *
+ * license file for more details (it's in a COPYING file included with *
+ * Nmap, and also available from https://svn.nmap.org/nmap/COPYING) *
+ * *
+ ***************************************************************************/
+#include
+
+struct probespec_tcpdata {
+ u16 dport;
+ u8 flags;
+};
+
+struct probespec_udpdata {
+ u16 dport;
+};
+
+struct probespec_sctpdata {
+ u16 dport;
+ u8 chunktype;
+};
+
+struct probespec_icmpdata {
+ u8 type;
+ u8 code;
+};
+
+struct probespec_icmpv6data {
+ u8 type;
+ u8 code;
+};
+
+#define PS_NONE 0
+#define PS_TCP 1
+#define PS_UDP 2
+#define PS_PROTO 3
+#define PS_ICMP 4
+#define PS_ARP 5
+#define PS_CONNECTTCP 6
+#define PS_SCTP 7
+#define PS_ICMPV6 8
+#define PS_ND 9
+
+/* The size of this structure is critical, since there can be tens of
+ thousands of them stored together ... */
+typedef struct probespec {
+ /* To save space, I changed this from private enum (took 4 bytes) to
+ u8 that uses #defines above */
+ u8 type;
+ u8 proto; /* If not PS_ARP -- Protocol number ... eg IPPROTO_TCP, etc. */
+ union {
+ struct probespec_tcpdata tcp; /* If type is PS_TCP or PS_CONNECTTCP. */
+ struct probespec_udpdata udp; /* PS_UDP */
+ struct probespec_sctpdata sctp; /* PS_SCTP */
+ struct probespec_icmpdata icmp; /* PS_ICMP */
+ struct probespec_icmpv6data icmpv6; /* PS_ICMPV6 */
+ /* Nothing needed for PS_ARP, since src mac and target IP are
+ avail from target structure anyway */
+ } pd;
+} probespec;
+
+#endif
diff --git a/scan_engine.h b/scan_engine.h
index 1f890b26a..33be6752b 100644
--- a/scan_engine.h
+++ b/scan_engine.h
@@ -135,6 +135,7 @@
#define SCAN_ENGINE_H
#include "scan_lists.h"
+#include "probespec.h"
#include
@@ -151,59 +152,6 @@
#include
class Target;
-struct probespec_tcpdata {
- u16 dport;
- u8 flags;
-};
-
-struct probespec_udpdata {
- u16 dport;
-};
-
-struct probespec_sctpdata {
- u16 dport;
- u8 chunktype;
-};
-
-struct probespec_icmpdata {
- u8 type;
- u8 code;
-};
-
-struct probespec_icmpv6data {
- u8 type;
- u8 code;
-};
-
-#define PS_NONE 0
-#define PS_TCP 1
-#define PS_UDP 2
-#define PS_PROTO 3
-#define PS_ICMP 4
-#define PS_ARP 5
-#define PS_CONNECTTCP 6
-#define PS_SCTP 7
-#define PS_ICMPV6 8
-#define PS_ND 9
-
-/* The size of this structure is critical, since there can be tens of
- thousands of them stored together ... */
-typedef struct probespec {
- /* To save space, I changed this from private enum (took 4 bytes) to
- u8 that uses #defines above */
- u8 type;
- u8 proto; /* If not PS_ARP -- Protocol number ... eg IPPROTO_TCP, etc. */
- union {
- struct probespec_tcpdata tcp; /* If type is PS_TCP or PS_CONNECTTCP. */
- struct probespec_udpdata udp; /* PS_UDP */
- struct probespec_sctpdata sctp; /* PS_SCTP */
- struct probespec_icmpdata icmp; /* PS_ICMP */
- struct probespec_icmpv6data icmpv6; /* PS_ICMPV6 */
- /* Nothing needed for PS_ARP, since src mac and target IP are
- avail from target structure anyway */
- } pd;
-} probespec;
-
/* 3rd generation Nmap scanning function. Handles most Nmap port scan types */
void ultra_scan(std::vector &Targets, struct scan_lists *ports,
stype scantype, struct timeout_info *to = NULL);
diff --git a/scan_engine_connect.cc b/scan_engine_connect.cc
index 15e5c0385..70b5343a6 100644
--- a/scan_engine_connect.cc
+++ b/scan_engine_connect.cc
@@ -133,6 +133,7 @@
#include "nmap_error.h"
#include "tcpip.h"
#include "Target.h"
+#include "scan_engine.h"
#include "scan_engine_connect.h"
#include "libnetutil/netutil.h" /* for max_sd() */
#include "NmapOps.h"
diff --git a/scan_engine_raw.cc b/scan_engine_raw.cc
index 9063a6eab..3210d42af 100644
--- a/scan_engine_raw.cc
+++ b/scan_engine_raw.cc
@@ -134,6 +134,7 @@
#include "NmapOps.h"
#include "Target.h"
#include "payload.h"
+#include "scan_engine.h"
#include "scan_engine_raw.h"
#include "struct_ip.h"
#include "tcpip.h"