diff --git a/libnetutil/netutil.cc b/libnetutil/netutil.cc index 47989a18b..e11b3f103 100644 --- a/libnetutil/netutil.cc +++ b/libnetutil/netutil.cc @@ -137,9 +137,7 @@ #include "nbase.h" -#ifdef WIN32 -#include "mswin32/winclude.h" -#else +#ifndef WIN32 #include #include #endif @@ -173,6 +171,11 @@ # endif #endif /* Solaris */ +#ifdef WIN32 +typedef unsigned __int32 u_int32_t; +typedef unsigned __int16 u_int16_t; +typedef unsigned __int8 u_int8_t; +#endif #if HAVE_NETINET_IN_H #include diff --git a/mswin32/nmap.vcxproj b/mswin32/nmap.vcxproj index 8338be6cb..e7bd3788d 100644 --- a/mswin32/nmap.vcxproj +++ b/mswin32/nmap.vcxproj @@ -244,7 +244,6 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje - @@ -363,4 +362,4 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje - + \ No newline at end of file diff --git a/mswin32/winclude.h b/mswin32/winclude.h deleted file mode 100644 index 335e0f5e5..000000000 --- a/mswin32/winclude.h +++ /dev/null @@ -1,150 +0,0 @@ -/*************************************************************************** - * winclude.h -- some windows include files and * - * windows-compatibility-related functions that are specific to Nmap. Most * - * of this has been moved into nbase so it can be shared. * - * * - ***********************IMPORTANT NMAP LICENSE TERMS************************ - * * - * The Nmap Security Scanner is (C) 1996-2019 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) * - * * - ***************************************************************************/ - -/* $Id: */ - -#ifndef WINCLUDE_H -#define WINCLUDE_H - -#include "nmap_winconfig.h" - -#include -#include - -#include "nbase.h" - -typedef unsigned __int32 u_int32_t; -typedef unsigned __int16 u_int16_t; -typedef unsigned __int8 u_int8_t; - -/* non-functioning stub function */ -int fork(); - -#endif /* WINCLUDE_H */ diff --git a/mswin32/winfix.cc b/mswin32/winfix.cc index 399f36449..a43f5add0 100644 --- a/mswin32/winfix.cc +++ b/mswin32/winfix.cc @@ -131,10 +131,7 @@ /* $Id: */ -#include -#include - - +#include #include "..\nmap.h" #include "..\tcpip.h" #include "winfix.h" @@ -142,6 +139,8 @@ #include "..\nmap_error.h" #include +#include + #ifdef _MSC_VER # include #endif diff --git a/nmap.h b/nmap.h index 4ab1f51b1..50ee6f93e 100644 --- a/nmap.h +++ b/nmap.h @@ -136,10 +136,6 @@ /************************INCLUDES**********************************/ -#ifdef WIN32 -#include "mswin32\winclude.h" -#endif - #ifdef HAVE_CONFIG_H #include "nmap_config.h" #else diff --git a/nmap_error.h b/nmap_error.h index fe6001f28..5ac361b11 100644 --- a/nmap_error.h +++ b/nmap_error.h @@ -132,10 +132,6 @@ #ifndef NMAP_ERROR_H #define NMAP_ERROR_H -#ifdef WIN32 -#include "mswin32\winclude.h" -#endif - #ifdef HAVE_CONFIG_H #include "nmap_config.h" #else diff --git a/services.h b/services.h index 5320b08f6..7c1fac5e3 100644 --- a/services.h +++ b/services.h @@ -134,9 +134,7 @@ #ifndef SERVICES_H #define SERVICES_H -#ifdef WIN32 -#include "mswin32\winclude.h" -#else +#ifndef WIN32 #include #endif diff --git a/struct_ip.h b/struct_ip.h index 7a568bcfe..34c26027d 100644 --- a/struct_ip.h +++ b/struct_ip.h @@ -17,6 +17,11 @@ struct ip { file, so it can be included in a .cc file after other .h have been included. */ +#ifdef WIN32 +typedef unsigned __int32 u_int32_t; +typedef unsigned __int16 u_int16_t; +typedef unsigned __int8 u_int8_t; +#endif /* Linux uses these defines in netinet/ip.h to use the correct struct ip */ #ifndef __FAVOR_BSD #define __FAVOR_BSD