From 0622056f86833abb76d740e60be6839387df9416 Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 16 Jul 2009 04:50:47 +0000
Subject: [PATCH] Remove some dead code from RPC scan. There was a "tries"
 variable and code to increase the scan delay if tries increased too much. But
 the main loop did an unconditional continue before incrementing tries, so it
 was always 0. I looked back at the history and saw that it was always like
 this for RPC scan. tries was only incremented for the other scan types
 handled by pos_scan, which now are done by ultra_scan. So I removed the tries
 accounting and dependent code.

---
 scan_engine.cc | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/scan_engine.cc b/scan_engine.cc
index 4504195c2..e2750945d 100644
--- a/scan_engine.cc
+++ b/scan_engine.cc
@@ -5516,7 +5516,6 @@ void pos_scan(Target *target, u16 *portarray, int numports, stype scantype) {
   struct scanstats ss;
   int senddelay = 0;
   int rpcportsscanned = 0;
-  int tries = 0;
   time_t starttime;
   struct timeval starttm;
   struct portinfo *scan = NULL,  *current, *next;
@@ -5585,14 +5584,7 @@ void pos_scan(Target *target, u16 *portarray, int numports, stype scantype) {
 
   do {
     ss.changed = 0;
-    if (tries > 3 && tries < 10) {
-      senddelay += 10000 * (tries - 3); 
-      if (o.verbose) log_write(LOG_STDOUT, "Bumping up senddelay by %d (to %d), due to excessive drops\n", 10000 * (tries - 3), senddelay);
-    } else if (tries >= 10) {
-      senddelay += 75000; 
-      if (o.verbose) log_write(LOG_STDOUT, "Bumping up senddelay by 75000 (to %d), due to excessive drops\n", senddelay);
-    }
-    
+
     if (senddelay > 200000) {
       ss.max_width = MIN(ss.max_width, 5);
       ss.numqueries_ideal = MIN(ss.max_width, ss.numqueries_ideal);
@@ -5778,27 +5770,13 @@ void pos_scan(Target *target, u16 *portarray, int numports, stype scantype) {
     }
     current = pil.testinglist = &scan[0]; 
     pil.firewalled = NULL;
-    ss.numqueries_outstanding = 0;
-    /* Now we out o' here! */
-    continue;
-    
-    if (ss.numqueries_outstanding != 0) {
-      fatal("Bean counting error no. 4321897: ports_left: %d numqueries_outstanding: %d\n", ss.ports_left, ss.numqueries_outstanding);
-    }
-
-    tries++;
 
     if (o.debugging) {
-      log_write(LOG_STDOUT, "Finished round #%d. Current stats: numqueries_ideal: %d; min_width: %d; max_width: %d; packet_incr: %d; senddelay: %dus; fallback: %.f%%\n", tries, (int) ss.numqueries_ideal, ss.min_width, ss.max_width, ss.packet_incr, senddelay, floor(100 * ss.fallback_percent));
+      log_write(LOG_STDOUT, "Finished round. Current stats: numqueries_ideal: %d; min_width: %d; max_width: %d; packet_incr: %d; senddelay: %dus; fallback: %.f%%\n", (int) ss.numqueries_ideal, ss.min_width, ss.max_width, ss.packet_incr, senddelay, floor(100 * ss.fallback_percent));
     }
     ss.numqueries_ideal = ss.initial_packet_width;
-    
-  } while(pil.testinglist && tries < 20);
+  } while(pil.testinglist);
   
-  if (tries == 20) {
-    error("WARNING: GAVE UP ON SCAN AFTER 20 RETRIES");
-  }
-
   numports = rpcportsscanned;
   if (SPM && o.verbose && (numports > 0)) {
     char scannedportsstr[14];