Closes #2541. Consolidate nmap-payloads and nmap-service-probes; use port scan responses in version scan.

Target.h

@@ -83,6 +83,7 @@ class FingerPrintResults;
 
 #include <list>
 #include <string>
+#include <vector>
 #include <time.h> /* time_t */
 
 #ifndef INET6_ADDRSTRLEN
@@ -116,6 +117,12 @@ struct TracerouteHop {
   }
 };
 
+struct EarlySvcResponse {
+  probespec pspec;
+  int len;
+  u8 data[1];
+};
+
 class Target {
  public: /* For now ... TODO: a lot of the data members should be made private */
   Target();
@@ -248,6 +255,7 @@ class Target {
   enum dist_calc_method distance_calculation_method;
   FingerPrintResults *FPR; /* FP results get by the OS scan system. */
   PortList ports;
+  std::vector<EarlySvcResponse *> earlySvcResponses;
 
   int weird_responses; /* echo responses from other addresses, Ie a network broadcast address */
   int flags; /* HOST_UNKNOWN, HOST_UP, or HOST_DOWN. */