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

Revert to the previous method of calculating completion percentage. Just

Browse Source 
counting the ratio of finished to total ports fails against filtered ports,
which are not marked completed until the very end.
This commit is contained in:
david
2008-08-14 15:35:29 +00:00
parent 47aa010d2e
commit e6d4512f4d
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scan_engine.cc
View File

@@ -1359,13 +1359,25 @@ HostScanStats *UltraScanInfo::nextIncompleteHost() {
is done. */
double UltraScanInfo::getCompletionFraction() {
list<HostScanStats *>::iterator hostI;
HostScanStats *host;
int maxtries;
double thishostpercdone;
double total;
/* Add 1 for each completed host. */
total= gstats->numtargets - numIncompleteHosts();
/* For incomplete hosts add the fraction of finished to total ports. */
for(hostI = incompleteHosts.begin(); hostI != incompleteHosts.end(); hostI++)
total += (double) (*hostI)->ports_finished / gstats->numprobes;
for(hostI = incompleteHosts.begin(); hostI != incompleteHosts.end(); hostI++) {
host = *hostI;
maxtries = host->allowedTryno(NULL, NULL) + 1;
// This is inexact (maxtries - 1) because numprobes_sent includes
// at least one try of ports_finished.
thishostpercdone = host->ports_finished * (maxtries - 1) + host->numprobes_sent;
thishostpercdone /= maxtries * gstats->numprobes;
if (thishostpercdone >= 0.9999)
thishostpercdone = 0.9999;
total += thishostpercdone;
}
return total / gstats->numtargets;
}