"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "nmap.cc" between
nmap-7.90.tgz and nmap-7.91.tgz

About: Nmap ("Network Mapper") is a utility for network exploration or security auditing (port scanner).

nmap.cc  (nmap-7.90.tgz):nmap.cc  (nmap-7.91.tgz)
skipping to change at line 63 skipping to change at line 63
* problems for other Free Software projects (such as KDE and NASM). * * 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 * * 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 * * useful, but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. Warranties, *
* indemnification and commercial support are all available through the * * indemnification and commercial support are all available through the *
* Npcap OEM program--see https://nmap.org/oem. * * Npcap OEM program--see https://nmap.org/oem. *
* * * *
***************************************************************************/ ***************************************************************************/
/* $Id: nmap.cc 38078 2020-10-02 16:12:22Z dmiller $ */ /* $Id: nmap.cc 38096 2020-10-09 22:18:58Z dmiller $ */
#ifdef WIN32 #ifdef WIN32
#include "winfix.h" #include "winfix.h"
/* This name collides in the following include. */ /* This name collides in the following include. */
#undef PS_NONE #undef PS_NONE
#include <shlobj.h> #include <shlobj.h>
#endif #endif
#include "nmap.h" #include "nmap.h"
#include "osscan.h" #include "osscan.h"
skipping to change at line 1536 skipping to change at line 1536
if (o.portlist && o.fastscan) if (o.portlist && o.fastscan)
fatal("You cannot use -F (fast scan) with -p (explicit port selection) but s ee --top-ports and --port-ratio to fast scan a range of ports"); fatal("You cannot use -F (fast scan) with -p (explicit port selection) but s ee --top-ports and --port-ratio to fast scan a range of ports");
if (o.ipprotscan) { if (o.ipprotscan) {
if (o.portlist) if (o.portlist)
getpts(o.portlist, &ports); getpts(o.portlist, &ports);
else else
getpts((char *) (o.fastscan ? "[P:0-]" : "0-"), &ports); // Default proto cols to scan getpts((char *) (o.fastscan ? "[P:0-]" : "0-"), &ports); // Default proto cols to scan
} else if (!o.noportscan) { } else if (!o.noportscan) {
if (o.portlist) {
for (const char *p=o.portlist; *p != '\0'; p++) {
if (*(p+1) == ':') {
switch(*p) {
case 'T':
if (!o.TCPScan()) {
error("WARNING: Your ports include \"T:\" but you haven't specif
ied any TCP scan type.");
}
break;
case 'U':
if (!o.UDPScan()) {
error("WARNING: Your ports include \"U:\" but you haven't specif
ied UDP scan with -sU.");
}
break;
case 'S':
if (!o.SCTPScan()) {
error("WARNING: Your ports include \"S:\" but you haven't specif
ied any SCTP scan type.");
}
break;
case 'P':
if (!o.ipprotscan) {
error("WARNING: Your ports include \"P:\" but you haven't specif
ied IP Protocol scan with -sO.");
}
break;
default:
break;
}
}
}
}
gettoppts(o.topportlevel, o.portlist, &ports, o.exclude_portlist); gettoppts(o.topportlevel, o.portlist, &ports, o.exclude_portlist);
} }
// Uncomment the following line to use the common lisp port spec test suite // Uncomment the following line to use the common lisp port spec test suite
//printf("port spec: (%d %d %d %d)\n", ports.tcp_count, ports.udp_count, ports .sctp_count, ports.prot_count); exit(0); //printf("port spec: (%d %d %d %d)\n", ports.tcp_count, ports.udp_count, ports .sctp_count, ports.prot_count); exit(0);
#ifdef WIN32 #ifdef WIN32
if (o.sendpref & PACKET_SEND_IP) { if (o.sendpref & PACKET_SEND_IP) {
error("WARNING: raw IP (rather than raw ethernet) packet sending attempted o n Windows. This probably won't work. Consider --send-eth next time."); error("WARNING: raw IP (rather than raw ethernet) packet sending attempted o n Windows. This probably won't work. Consider --send-eth next time.");
} }
 End of changes. 2 change blocks. 
1 lines changed or deleted 35 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)