CERBERUS/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-05-13 16:57:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

remove unneeded OS_SCAN_DEFAULT #define (multi-gen support is long gone)

Browse source
This commit is contained in:
kris 2010-05-06 23:00:09 +00:00
parent 89b3eef5f6
commit 75a17210f7
2 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nmap.cc
View file

@ -1021,7 +1021,7 @@ int nmap_main(int argc, char *argv[]) {
o.script = 1;
#endif
if (o.isr00t) {
o.osscan = OS_SCAN_DEFAULT;
o.osscan++;
o.traceroute = true;
}
break;
@ -1131,7 +1131,7 @@ int nmap_main(int argc, char *argv[]) {
case 'n': o.noresolve++; break;
case 'O':
if (!optarg || *optarg == '2')
o.osscan = OS_SCAN_DEFAULT;
o.osscan++;
else if (*optarg == '1')
fatal("First-generation OS detection (-O1) is no longer supported. Use -O instead.");
else
@ -1373,7 +1373,7 @@ int nmap_main(int argc, char *argv[]) {
if (pre_host_timeout != -1) o.host_timeout = pre_host_timeout;
if (o.osscan == OS_SCAN_DEFAULT)
if (o.osscan)
o.reference_FPs = parse_fingerprint_reference_file("nmap-os-db");
validate_scan_lists(ports,o);
@ -1923,7 +1923,7 @@ int nmap_main(int argc, char *argv[]) {
}
}
if (o.osscan == OS_SCAN_DEFAULT)
if (o.osscan)
os_scan2(Targets);
if (o.traceroute)

3
nmap.h
View file

@ -366,9 +366,6 @@ void *realloc();
/* For nonroot. */
#define DEFAULT_PING_CONNECT_PORT_SPEC "80,443"
/* OS scan */
#define OS_SCAN_DEFAULT 9
/* How many syn packets do we send to TCP sequence a host? */
#define NUM_SEQ_SAMPLES 6