PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2026-01-01 20:39:02 +00:00
Code Issues Projects Releases Wiki Activity

Majek's Portlist change patch

Browse Source
This commit is contained in:
fyodor
2006-05-14 05:00:58 +00:00
parent 396a6c6d48
commit 37fac543b5
10 changed files with 295 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
osscan.cc
View File

@@ -581,16 +581,16 @@ static FingerPrint *get_fingerprint(Target *target, struct seq_info *si) {
target->FPR->osscan_opentcpport = -1;
target->FPR->osscan_closedtcpport = -1;
tport = NULL;
if ((tport = target->ports.nextPort(NULL, IPPROTO_TCP, PORT_OPEN, false))) {
if ((tport = target->ports.nextPort(NULL, IPPROTO_TCP, PORT_OPEN))) {
openport = tport->portno;
target->FPR->osscan_opentcpport = tport->portno;
}
/* Now we should find a closed port */
if ((tport = target->ports.nextPort(NULL, IPPROTO_TCP, PORT_CLOSED, false))) {
if ((tport = target->ports.nextPort(NULL, IPPROTO_TCP, PORT_CLOSED))) {
closedport = tport->portno;
target->FPR->osscan_closedtcpport = tport->portno;
} else if ((tport = target->ports.nextPort(NULL, IPPROTO_TCP, PORT_UNFILTERED, false))) {
} else if ((tport = target->ports.nextPort(NULL, IPPROTO_TCP, PORT_UNFILTERED))) {
/* Well, we will settle for unfiltered */
closedport = tport->portno;
} else {
@@ -1445,9 +1445,9 @@ o.current_scantype = OS_SCAN;
target->FPR = new FingerPrintResults;
memset(si, 0, sizeof(si));
if (target->ports.state_counts_tcp[PORT_OPEN] == 0 ||
(target->ports.state_counts_tcp[PORT_CLOSED] == 0 &&
target->ports.state_counts_tcp[PORT_UNFILTERED] == 0)) {
if (target->ports.getStateCounts(IPPROTO_TCP, PORT_OPEN) == 0 ||
(target->ports.getStateCounts(IPPROTO_TCP, PORT_CLOSED) == 0 &&
target->ports.getStateCounts(IPPROTO_TCP, PORT_UNFILTERED) == 0)) {
if (o.osscan_limit) {
if (o.verbose)
log_write(LOG_STDOUT|LOG_NORMAL|LOG_SKID, "Skipping OS Scan due to absence of open (or perhaps closed) ports\n");