diff --git a/nping/ArgParser.cc b/nping/ArgParser.cc index a54516a25..35a42b08d 100644 --- a/nping/ArgParser.cc +++ b/nping/ArgParser.cc @@ -66,7 +66,6 @@ #include "ArgParser.h" #include "NpingOps.h" -#include "common.h" #include "nbase.h" #include "utils.h" #include "utils_net.h" diff --git a/nping/Makefile.in b/nping/Makefile.in index 39e045a4e..610453ea7 100644 --- a/nping/Makefile.in +++ b/nping/Makefile.in @@ -65,11 +65,11 @@ DESTDIR = TARGET = nping -export SRCS = ArgParser.cc common.cc common_modified.cc nping.cc NpingOps.cc utils.cc utils_net.cc output.cc stats.cc NpingTargets.cc NpingTarget.cc EchoHeader.cc EchoServer.cc EchoClient.cc ProbeMode.cc NEPContext.cc Crypto.cc +export SRCS = ArgParser.cc common_modified.cc nping.cc NpingOps.cc utils.cc utils_net.cc output.cc stats.cc NpingTargets.cc NpingTarget.cc EchoHeader.cc EchoServer.cc EchoClient.cc ProbeMode.cc NEPContext.cc Crypto.cc -export HDRS = ArgParser.h nping_config.h common.h common_modified.h nping.h NpingOps.h output.h utils.h utils_net.h stats.h NpingTargets.h NpingTarget.h EchoHeader.h EchoServer.h EchoClient.h ProbeMode.h NEPContext.h Crypto.h +export HDRS = ArgParser.h nping_config.h common_modified.h nping.h NpingOps.h output.h utils.h utils_net.h stats.h NpingTargets.h NpingTarget.h EchoHeader.h EchoServer.h EchoClient.h ProbeMode.h NEPContext.h Crypto.h -OBJS = ArgParser.o common.o common_modified.o nping.o NpingOps.o utils.o utils_net.o output.o stats.o NpingTargets.o NpingTarget.o EchoHeader.o EchoServer.o EchoClient.o ProbeMode.o NEPContext.o Crypto.o +OBJS = ArgParser.o common_modified.o nping.o NpingOps.o utils.o utils_net.o output.o stats.o NpingTargets.o NpingTarget.o EchoHeader.o EchoServer.o EchoClient.o ProbeMode.o NEPContext.o Crypto.o export DOCS2DIST = leet-nping-ascii-art.txt nping.1 nping-man.html diff --git a/nping/NpingOps.cc b/nping/NpingOps.cc index 313b960f8..a18d0815f 100644 --- a/nping/NpingOps.cc +++ b/nping/NpingOps.cc @@ -70,7 +70,6 @@ #include "utils_net.h" #include "ArgParser.h" #include "output.h" -#include "common.h" #include diff --git a/nping/NpingTarget.cc b/nping/NpingTarget.cc index 539f868c2..f08ecac28 100644 --- a/nping/NpingTarget.cc +++ b/nping/NpingTarget.cc @@ -74,7 +74,6 @@ #include "nbase.h" #include "nping.h" #include "output.h" -#include "common.h" #include "stats.h" #include "common_modified.h" diff --git a/nping/NpingTarget.h b/nping/NpingTarget.h index 14a9633d9..64381c9ca 100644 --- a/nping/NpingTarget.h +++ b/nping/NpingTarget.h @@ -65,7 +65,6 @@ #define NPINGTARGET_H #include "nping.h" -#include "common.h" #include "../libnetutil/netutil.h" #ifndef INET6_ADDRSTRLEN diff --git a/nping/NpingTargets.cc b/nping/NpingTargets.cc index 8df779d0d..3cd83d24e 100644 --- a/nping/NpingTargets.cc +++ b/nping/NpingTargets.cc @@ -65,7 +65,6 @@ #include "nbase.h" #include "utils.h" #include "NpingTargets.h" -#include "common.h" #include "common_modified.h" #include diff --git a/nping/common.cc b/nping/common.cc deleted file mode 100644 index 7d82a6273..000000000 --- a/nping/common.cc +++ /dev/null @@ -1,66 +0,0 @@ - -/*************************************************************************** - * common.cc -- This file holds all those functions and classes that have * - * been copied verbatim from Nmap's source code * - * * - ***********************IMPORTANT NMAP LICENSE TERMS************************ - * - * The Nmap Security Scanner is (C) 1996-2026 Nmap Software LLC ("The Nmap - * Project"). Nmap is also a registered trademark of the Nmap Project. - * - * This program is distributed under the terms of the Nmap Public Source - * License (NPSL). The exact license text applying to a particular Nmap - * release or source code control revision is contained in the LICENSE - * file distributed with that version of Nmap or source code control - * revision. More Nmap copyright/legal information is available from - * https://nmap.org/book/man-legal.html, and further information on the - * NPSL license itself can be found at https://nmap.org/npsl/ . This - * header summarizes some key points from the Nmap license, but is no - * substitute for the actual license text. - * - * Nmap is generally free for end users to download and use themselves, - * including commercial use. It is available from https://nmap.org. - * - * The Nmap license generally prohibits companies from using and - * redistributing Nmap in commercial products, but we sell a special Nmap - * OEM Edition with a more permissive license and special features for - * this purpose. See https://nmap.org/oem/ - * - * If you have received a written Nmap license agreement or contract - * stating terms other than these (such as an Nmap OEM license), you may - * choose to use and redistribute Nmap under those terms instead. - * - * The official Nmap Windows builds include the Npcap software - * (https://npcap.com) for packet capture and transmission. It is under - * separate license terms which forbid redistribution without special - * permission. So the official Nmap Windows builds may not be redistributed - * without special permission (such as an Nmap OEM license). - * - * 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 submit your changes as a - * Github PR or by email to the dev@nmap.org mailing list for possible - * incorporation into the main distribution. Unless you specify otherwise, it - * is understood that you are offering us very broad rights to use your - * submissions as described in the Nmap Public Source License Contributor - * Agreement. This is important because we fund the project by selling licenses - * with various terms, and also because the inability to relicense code has - * caused devastating problems for other Free Software projects (such as KDE - * and NASM). - * - * The free version of Nmap 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. Warranties, - * indemnification and commercial support are all available through the - * Npcap OEM program--see https://nmap.org/oem/ - * - ***************************************************************************/ - -/* THIS FILE HAS ALL THE FUNCTIONS THAT I'VE COPIED VERBATIM FROM NMAP'S - * SOURCE CODE. */ - -#include "nping.h" -#include "common.h" diff --git a/nping/common.h b/nping/common.h deleted file mode 100644 index 784587c92..000000000 --- a/nping/common.h +++ /dev/null @@ -1,70 +0,0 @@ - -/*************************************************************************** - * common.h -- This file holds all those functions and classes that have * - * been copied verbatim from Nmap's source code * - * * - ***********************IMPORTANT NMAP LICENSE TERMS************************ - * - * The Nmap Security Scanner is (C) 1996-2026 Nmap Software LLC ("The Nmap - * Project"). Nmap is also a registered trademark of the Nmap Project. - * - * This program is distributed under the terms of the Nmap Public Source - * License (NPSL). The exact license text applying to a particular Nmap - * release or source code control revision is contained in the LICENSE - * file distributed with that version of Nmap or source code control - * revision. More Nmap copyright/legal information is available from - * https://nmap.org/book/man-legal.html, and further information on the - * NPSL license itself can be found at https://nmap.org/npsl/ . This - * header summarizes some key points from the Nmap license, but is no - * substitute for the actual license text. - * - * Nmap is generally free for end users to download and use themselves, - * including commercial use. It is available from https://nmap.org. - * - * The Nmap license generally prohibits companies from using and - * redistributing Nmap in commercial products, but we sell a special Nmap - * OEM Edition with a more permissive license and special features for - * this purpose. See https://nmap.org/oem/ - * - * If you have received a written Nmap license agreement or contract - * stating terms other than these (such as an Nmap OEM license), you may - * choose to use and redistribute Nmap under those terms instead. - * - * The official Nmap Windows builds include the Npcap software - * (https://npcap.com) for packet capture and transmission. It is under - * separate license terms which forbid redistribution without special - * permission. So the official Nmap Windows builds may not be redistributed - * without special permission (such as an Nmap OEM license). - * - * 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 submit your changes as a - * Github PR or by email to the dev@nmap.org mailing list for possible - * incorporation into the main distribution. Unless you specify otherwise, it - * is understood that you are offering us very broad rights to use your - * submissions as described in the Nmap Public Source License Contributor - * Agreement. This is important because we fund the project by selling licenses - * with various terms, and also because the inability to relicense code has - * caused devastating problems for other Free Software projects (such as KDE - * and NASM). - * - * The free version of Nmap 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. Warranties, - * indemnification and commercial support are all available through the - * Npcap OEM program--see https://nmap.org/oem/ - * - ***************************************************************************/ - -/* THIS FILE HAS ALL THE FUNCTIONS THAT I'VE COPIED VERBATIM FROM NMAP'S - * SOURCE CODE. */ - -#ifndef COMMON_H -#define COMMON_H 1 - -#include "nping.h" - -#endif /* COMMON_H */ diff --git a/nping/common_modified.cc b/nping/common_modified.cc index d3c11438e..b8605cfad 100644 --- a/nping/common_modified.cc +++ b/nping/common_modified.cc @@ -60,7 +60,6 @@ * ***************************************************************************/ #include "nping.h" -#include "common.h" #include "common_modified.h" #include "output.h" diff --git a/nping/common_modified.h b/nping/common_modified.h index 75d3507a7..e1555343e 100644 --- a/nping/common_modified.h +++ b/nping/common_modified.h @@ -64,7 +64,6 @@ #define COMMON_MODIFIED_H 1 #include "nping.h" -#include "common.h" /***************************************************************************** * STUFF FROM tcpip.cc diff --git a/nping/nping.cc b/nping/nping.cc index 53f47754b..1cf6e272d 100644 --- a/nping/nping.cc +++ b/nping/nping.cc @@ -74,7 +74,6 @@ #include "EchoClient.h" #include "EchoServer.h" #include "ProbeMode.h" -#include "common.h" #include "dnet.h" #include "pcap.h" #include diff --git a/nping/nping.vcxproj b/nping/nping.vcxproj index 76186a3f5..ace9c7bff 100644 --- a/nping/nping.vcxproj +++ b/nping/nping.vcxproj @@ -133,7 +133,6 @@ - @@ -153,7 +152,6 @@ - diff --git a/nping/utils.h b/nping/utils.h index 7c8c350e8..98af10622 100644 --- a/nping/utils.h +++ b/nping/utils.h @@ -62,8 +62,6 @@ #ifndef UTILS_H #define UTILS_H 1 -#include "common.h" - #include #include