minor patches from kris

NmapOps.cc

@@ -229,7 +229,7 @@ void NmapOps::Initialize() {
   listscan = pingscan = allowall = ackscan = bouncescan = connectscan = 0;
   rpcscan = nullscan = xmasscan = fragscan = synscan = windowscan = 0;
   maimonscan = idlescan = finscan = udpscan = ipprotscan = noresolve = 0;
-  force = append_output = 0;
+  append_output = 0;
   memset(logfd, 0, sizeof(FILE *) * LOG_NUM_FILES);
   ttl = -1;
   badsum = 0;

NmapOps.h

@@ -281,7 +281,6 @@ class NmapOps {
   int windowscan;
   int xmasscan;
   int noresolve;
-  int force; /* force nmap to continue on even when the outcome seems somewhat certain */
   int append_output; /* Append to any output files rather than overwrite */
   FILE *logfd[LOG_NUM_FILES];
   FILE *nmap_stdout; /* Nmap standard output */

nmap.h

@@ -430,26 +430,15 @@ void *realloc();
 /* print Interactive usage information */
 void printinteractiveusage();
 
-int check_ident_port(struct in_addr target);
-
 int ftp_anon_connect(struct ftpinfo *ftp);
 
 /* port manipulators */
-void getprobepts(char *expr);
 struct scan_lists *getpts(char *expr); /* someone stole the name getports()! */
 void free_scan_lists(struct scan_lists *ports);
-int getidentinfoz(struct in_addr target, u16 localport, u16 remoteport,
-		  char *owner, int ownersz);
 
 /* socket manipulation functions */
 void init_socket(int sd);
 
-/* RAW packet building/dissasembling stuff */
-int isup(struct in_addr target);
-int listen_icmp(int icmpsock, unsigned short outports[],
-		unsigned short numtries[], int *num_out,
-		struct in_addr target, PortList *ports);
-
 /* Renamed main so that interactive mode could preprocess when neccessary */
 int nmap_main(int argc, char *argv[]);
 

output.cc

@@ -1369,7 +1369,7 @@ void printosscanoutput(Target *currenths) {
 		mergeFPs(FPR->FPs, FPR->numFPs, !reason,
 			 currenths->v4hostip(), distance, currenths->MACAddress(),
 			 FPR->osscan_opentcpport, FPR->osscan_closedtcpport, 
-			 FPR->osscan_closedudpport, !reason));
+			 FPR->osscan_closedudpport, true));
 
     }
   } else if (FPR->overall_results == OSSCAN_NOMATCHES) {