diff --git a/Makefile.in b/Makefile.in index 7e7245176..921b14339 100644 --- a/Makefile.in +++ b/Makefile.in @@ -100,7 +100,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 service_scan.cc services.cc Target.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 global_structures.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 services.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 protocols.h scan_engine.h scan_engine_connect.h scan_engine_raw.h service_scan.h services.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 main.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 service_scan.o services.o TargetGroup.o Target.o targets.o tcpip.o timing.o traceroute.o utils.o xml.o $(NSE_OBJS) diff --git a/TargetGroup.cc b/TargetGroup.cc index 8f5d0891a..63b37aa77 100644 --- a/TargetGroup.cc +++ b/TargetGroup.cc @@ -129,7 +129,7 @@ #include "TargetGroup.h" #include "NmapOps.h" #include "nmap_error.h" -#include "global_structures.h" +#include "nmap.h" #include "libnetutil/netutil.h" #include diff --git a/global_structures.h b/global_structures.h deleted file mode 100644 index c7980252a..000000000 --- a/global_structures.h +++ /dev/null @@ -1,161 +0,0 @@ - -/*************************************************************************** - * global_structures.h -- Common structure definitions used by Nmap * - * components. * - * * - ***********************IMPORTANT NMAP LICENSE TERMS************************ - * * - * The Nmap Security Scanner is (C) 1996-2015 Insecure.Com LLC. Nmap is * - * also a registered trademark of Insecure.Com LLC. 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, Insecure.Com LLC 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. * - * * - * 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, are happy to help. As mentioned above, we also * - * offer 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 for priority 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 (Insecure.Com LLC) 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) * - * * - ***************************************************************************/ - -/* $Id$ */ - - -#ifndef GLOBAL_STRUCTURES_H -#define GLOBAL_STRUCTURES_H - - -/* The various kinds of port/protocol scans we can have - * Each element is to point to an array of port/protocol numbers - */ -struct scan_lists { - /* The "synprobes" are also used when doing a connect() ping */ - unsigned short *syn_ping_ports; - unsigned short *ack_ping_ports; - unsigned short *udp_ping_ports; - unsigned short *sctp_ping_ports; - unsigned short *proto_ping_ports; - int syn_ping_count; - int ack_ping_count; - int udp_ping_count; - int sctp_ping_count; - int proto_ping_count; - //the above fields are only used for host discovery - //the fields below are only used for port scanning - unsigned short *tcp_ports; - int tcp_count; - unsigned short *udp_ports; - int udp_count; - unsigned short *sctp_ports; - int sctp_count; - unsigned short *prots; - int prot_count; -}; - -typedef enum { STYPE_UNKNOWN, HOST_DISCOVERY, ACK_SCAN, SYN_SCAN, FIN_SCAN, XMAS_SCAN, UDP_SCAN, CONNECT_SCAN, NULL_SCAN, WINDOW_SCAN, SCTP_INIT_SCAN, SCTP_COOKIE_ECHO_SCAN, MAIMON_SCAN, IPPROT_SCAN, PING_SCAN, PING_SCAN_ARP, IDLE_SCAN, BOUNCE_SCAN, SERVICE_SCAN, OS_SCAN, SCRIPT_PRE_SCAN, SCRIPT_SCAN, SCRIPT_POST_SCAN, TRACEROUTE, PING_SCAN_ND }stype; - -#endif /*GLOBAL_STRUCTURES_H */ - diff --git a/mswin32/nmap.vcxproj b/mswin32/nmap.vcxproj index a9de96080..241063a67 100644 --- a/mswin32/nmap.vcxproj +++ b/mswin32/nmap.vcxproj @@ -192,7 +192,6 @@ - @@ -345,4 +344,4 @@ - \ No newline at end of file + diff --git a/nmap.h b/nmap.h index 15f18b217..62e95cb7f 100644 --- a/nmap.h +++ b/nmap.h @@ -327,13 +327,36 @@ # define recvfrom6_t int #endif -/********************** LOCAL INCLUDES *****************************/ - -#include "global_structures.h" - /***********************STRUCTURES**********************************/ -/* Moved to global_structures.h */ +/* The various kinds of port/protocol scans we can have + * Each element is to point to an array of port/protocol numbers + */ +struct scan_lists { + /* The "synprobes" are also used when doing a connect() ping */ + unsigned short *syn_ping_ports; + unsigned short *ack_ping_ports; + unsigned short *udp_ping_ports; + unsigned short *sctp_ping_ports; + unsigned short *proto_ping_ports; + int syn_ping_count; + int ack_ping_count; + int udp_ping_count; + int sctp_ping_count; + int proto_ping_count; + //the above fields are only used for host discovery + //the fields below are only used for port scanning + unsigned short *tcp_ports; + int tcp_count; + unsigned short *udp_ports; + int udp_count; + unsigned short *sctp_ports; + int sctp_count; + unsigned short *prots; + int prot_count; +}; + +typedef enum { STYPE_UNKNOWN, HOST_DISCOVERY, ACK_SCAN, SYN_SCAN, FIN_SCAN, XMAS_SCAN, UDP_SCAN, CONNECT_SCAN, NULL_SCAN, WINDOW_SCAN, SCTP_INIT_SCAN, SCTP_COOKIE_ECHO_SCAN, MAIMON_SCAN, IPPROT_SCAN, PING_SCAN, PING_SCAN_ARP, IDLE_SCAN, BOUNCE_SCAN, SERVICE_SCAN, OS_SCAN, SCRIPT_PRE_SCAN, SCRIPT_SCAN, SCRIPT_POST_SCAN, TRACEROUTE, PING_SCAN_ND }stype; /***********************PROTOTYPES**********************************/ diff --git a/nse_main.h b/nse_main.h index d2a3eb054..ddaf5e69c 100644 --- a/nse_main.h +++ b/nse_main.h @@ -12,7 +12,6 @@ extern "C" { } #include "nmap.h" -#include "global_structures.h" class ScriptResult { diff --git a/todo/dmiller.txt b/todo/dmiller.txt index f3098e08d..dee3875a0 100644 --- a/todo/dmiller.txt +++ b/todo/dmiller.txt @@ -3,14 +3,9 @@ * Make sure Ndiff, Zenmap are 2to3 compatible with python -3 -* make build process detect Python major version (2 or 3). Breaks on Arch Linux, - which uses Python 3 by default. - * Script to check for updated versions of included libs. Have shell for libpcap, but should convert to python. -* Get rid of global_structures.h (integrate into more-specific header files) - * NSE stuff * broadcast-srvloc-info - test * broadcast-rpcbind - write, test