From c8106e0ef360093cf10132b2391c99eb3dbbe07f Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Fri, 17 Sep 2010 16:35:01 +0000
Subject: [PATCH] Let --min-rtt-timeout be a lower bound on the initial timeout
 for ARP scan. ARP scan had a hardcoded initial timeout of 100 ms, which could
 be lower than the minimum requested. The default minimum timeout is also 100
 ms, so this has no effect if --min-rtt-timeout is not used.

---
 scan_engine.cc | 2 +-
 targets.cc     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scan_engine.cc b/scan_engine.cc
index d4bebf862..380d06095 100644
--- a/scan_engine.cc
+++ b/scan_engine.cc
@@ -924,7 +924,7 @@ GroupScanStats::GroupScanStats(UltraScanInfo *UltraSI) {
   initialize_timeout_info(&to);
   /* Default timout should be much lower for arp */
   if (USI->ping_scan_arp)
-    to.timeout = MIN(o.initialRttTimeout(), 100) * 1000;
+    to.timeout = MAX(o.minRttTimeout(), MIN(o.initialRttTimeout(), 100)) * 1000;
   num_probes_active = 0;
   numtargets = USI->numIncompleteHosts(); // They are all incomplete at the beginning
   numprobes = USI->numProbesPerHost();
diff --git a/targets.cc b/targets.cc
index 496a0802c..2d884afbf 100644
--- a/targets.cc
+++ b/targets.cc
@@ -117,7 +117,7 @@ static void arpping(Target *hostbatch[], int num_hosts) {
   for (targetno = 0; targetno < num_hosts; targetno++) {
     initialize_timeout_info(&hostbatch[targetno]->to);
     /* Default timout should be much lower for arp */
-    hostbatch[targetno]->to.timeout = MIN(o.initialRttTimeout(), 100) * 1000;
+    hostbatch[targetno]->to.timeout = MAX(o.minRttTimeout(), MIN(o.initialRttTimeout(), 100)) * 1000;
     if (!hostbatch[targetno]->SrcMACAddress()) {
       bool islocal = islocalhost(hostbatch[targetno]->v4hostip());
       if (islocal) {