From 7872aafa5d2704212be36e40331bd73e0676310a Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Tue, 31 Mar 2009 18:29:52 +0000
Subject: [PATCH] Update the global o.numhosts_scanning variable within
 ultra_scan, so that it is set properly for ping scan. Previously status
 reports during ping scan always looked like

Stats: 25:34:33 elapsed; 991232 hosts completed (72530 up), 0 undergoing Ping Scan

Note the "0 undergoing". Now that number will be set to 4096 or whatever
the current ping scan group size happens to be.
---
 nmap.cc        | 1 -
 scan_engine.cc | 3 +++
 targets.cc     | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/nmap.cc b/nmap.cc
index 80425f841..4bf89d448 100644
--- a/nmap.cc
+++ b/nmap.cc
@@ -1621,7 +1621,6 @@ int nmap_main(int argc, char *argv[]) {
 	if (!currenths)
 	  break;
       }
-      o.numhosts_scanned++;
     
       if (currenths->flags & HOST_UP && !o.listscan) 
 	o.numhosts_up++;
diff --git a/scan_engine.cc b/scan_engine.cc
index 61092a96d..3315b08b2 100644
--- a/scan_engine.cc
+++ b/scan_engine.cc
@@ -4873,6 +4873,9 @@ void ultra_scan(vector<Target *> &Targets, struct scan_lists *ports,
   }
 #endif
 
+  // Set the variable for status printing
+  o.numhosts_scanning = Targets.size();
+
   startTimeOutClocks(Targets);
   USI = new UltraScanInfo(Targets, ports, scantype);
 
diff --git a/targets.cc b/targets.cc
index 449ad72e5..0e1692fed 100644
--- a/targets.cc
+++ b/targets.cc
@@ -529,6 +529,7 @@ do {
 	goto batchfull;
       }
       hs->current_batch_sz++;
+      o.numhosts_scanned++;
 }
 
   if (hs->current_batch_sz < hs->max_batch_sz &&