Make the old massping be used when NEW_MASSPING is undefined in targets.h. This

is the last revision that contains massping.

targets.cc

@@ -111,10 +111,6 @@
 #include "nmap_tty.h"
 #include "utils.h"
 
-/* If defined, use the new massping that uses ultra_scan instead of the old
-   standalone function. */
-#define NEW_MASSPING
-
 using namespace std;
 extern NmapOps o;
 enum pingstyle { pingstyle_unknown, pingstyle_rawtcp, pingstyle_rawudp, pingstyle_connecttcp, 

targets.h

@@ -126,6 +126,10 @@
 #include "nmap.h"
 #include "global_structures.h"
 
+/* If defined, use the new massping that uses ultra_scan instead of the old
+   standalone function. */
+#define NEW_MASSPING
+
 class HostGroupState;
 
 /**************************STRUCTURES******************************/
@@ -156,6 +160,9 @@ struct tcpqueryinfo {
 
 struct pingtech {
   unsigned int rawicmpscan: 1,
+#ifndef NEW_MASSPING
+    icmpscan: 1,
+#endif
     connecttcpscan: 1,
     rawtcpscan: 1,
     rawudpscan: 1;