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

Optimize processData: Reduce iterations looking for global pings

Browse Source
This commit is contained in:
dmiller
2024-03-01 19:29:55 +00:00
parent 8b380fd505
commit 8d0a4d9b2a
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scan_engine.cc
View File

@@ -2695,19 +2695,28 @@ static void processData(UltraScanInfo *USI) {
/* Check for expired global pings. */
HostScanStats *pinghost = USI->gstats->pinghost;
if (pinghost != NULL) {
long to_us = pinghost->probeTimeout();
for (probeI = pinghost->probes_outstanding.begin();
probeI != pinghost->probes_outstanding.end();
probeI = nextProbeI) {
nextProbeI = probeI;
nextProbeI++;
probe = *probeI;
/* If a global ping probe times out, we want to get rid of it so a new
host can take its place. */
if ((*probeI)->isPing()
&& TIMEVAL_SUBTRACT(USI->now, (*probeI)->sent) > (long) pinghost->probeTimeout()) {
if (o.debugging)
log_write(LOG_STDOUT, "Destroying timed-out global ping from %s.\n", pinghost->target->targetipstr());
/* ultrascan_ping_update destroys the probe. */
ultrascan_ping_update(USI, pinghost, probeI, NULL);
if (probe->isPing()) {
if (TIMEVAL_SUBTRACT(USI->now, probe->sent) > to_us) {
if (o.debugging)
log_write(LOG_STDOUT, "Destroying timed-out global ping from %s.\n", pinghost->target->targetipstr());
/* ultrascan_ping_update destroys the probe. */
ultrascan_ping_update(USI, pinghost, probeI, NULL);
// ultrascan_*_update() can change timeout
to_us = pinghost->probeTimeout();
}
else {
// If this one isn't timed out, no later ones will be either.
break;
}
}
}
}