range-file - reading IP addresses from file

src/main-conf.c

@@ -14,6 +14,7 @@
 #include "masscan.h"
 #include "masscan-version.h"
 #include "ranges.h"
+#include "range-file.h"     /* reads millions of IP addresss from a file */
 #include "string_s.h"
 #include "logger.h"
 #include "proto-banner1.h"
@@ -326,7 +327,7 @@ masscan_save_state(struct Masscan *masscan)
 }
 
 
-
+#if 0
 /*****************************************************************************
  * Read in ranges from a file
  *
@@ -430,6 +431,7 @@ ranges_from_file(struct RangeList *ranges, const char *filename)
      * before it can be used */
     rangelist_sort(ranges);
 }
+#endif
 
 /***************************************************************************
  ***************************************************************************/
@@ -1940,11 +1942,21 @@ masscan_set_parameter(struct Masscan *masscan,
     } else if (EQUALS("excludefile", name)) {
         unsigned count1 = masscan->exclude_ip.count;
         unsigned count2;
+        int err;
+        const char *filename = value;
+
         LOG(1, "EXCLUDING: %s\n", value);
-        ranges_from_file(&masscan->exclude_ip, value);
+        err = rangefile_read(filename, &masscan->exclude_ip, &masscan->exclude_ipv6);
+        if (err) {
+            LOG(0, "FAIL: error reading from exclude file\n");
+            exit(1);
+        }
+
+        /* Detect if this file has made any change, otherwise don't print
+         * a message */
         count2 = masscan->exclude_ip.count;
         if (count2 - count1)
-        fprintf(stderr, "%s: excluding %u ranges from file\n",
+            fprintf(stderr, "%s: excluding %u ranges from file\n",
                 value, count2 - count1);
     } else if (EQUALS("heartbleed", name)) {
         masscan->is_heartbleed = 1;
@@ -2004,7 +2016,14 @@ masscan_set_parameter(struct Masscan *masscan,
     } else if (EQUALS("iflist", name)) {
         masscan->op = Operation_List_Adapters;
     } else if (EQUALS("includefile", name)) {
-        ranges_from_file(&masscan->targets, value);
+        int err;
+        const char *filename = value;
+
+        err = rangefile_read(filename, &masscan->targets, &masscan->targets_ipv6);
+        if (err) {
+            LOG(0, "FAIL: error reading from include file\n");
+            exit(1);
+        }
         if (masscan->op == 0)
             masscan->op = Operation_Scan;
     } else if (EQUALS("infinite", name)) {

src/main.c

@@ -58,6 +58,7 @@
 #include "vulncheck.h"          /* checking vulns like monlist, poodle, heartblee */
 #include "main-readrange.h"
 #include "scripting.h"
+#include "range-file.h"         /* reading ranges from a file */
 #include "read-service-probes.h"
 #include "util-malloc.h"
 
@@ -1686,6 +1687,7 @@ int main(int argc, char *argv[])
             x += lcg_selftest();
             x += template_selftest();
             x += ranges_selftest();
+            x += rangefile_selftest();
             x += pixie_time_selftest();
             x += rte_ring_selftest();
             x += mainconf_selftest();

src/masscan.h

@@ -8,6 +8,7 @@
 #include <time.h>
 
 #include "ranges.h"
+#include "ranges6.h"
 #include "packet-queue.h"
 
 struct Adapter;
@@ -141,6 +142,7 @@ struct Masscan
      * and such, and sort the target ranges.
      */
     struct RangeList targets;
+    struct Range6List targets_ipv6;
 
     /**
      * The ports we are scanning for. The user can specify repeated ports
@@ -166,6 +168,7 @@ struct Masscan
      */
     struct RangeList exclude_ip;
     struct RangeList exclude_port;
+    struct Range6List exclude_ipv6;
 
 
     /**

src/proto-oproto.c

@@ -1,4 +1,5 @@
 #include "proto-oproto.h"
+#include "unusedparm.h"
 
 void
 handle_oproto(struct Output *out, time_t timestamp,

src/proto-tcp-rdp.c

@@ -168,7 +168,7 @@ cotp_parse(struct BannerOutput *banout, struct RDPSTUFF *rdp, const unsigned cha
                          * by 1. */
                         assert(bytes_parsed != 0);
                         offset += bytes_parsed - 1;
-                        rdp->cotp.len -= bytes_parsed;
+                        rdp->cotp.len -= (unsigned char)bytes_parsed;
 
                         /* If we have bytes left in the TPKT, then stay in this state,
                          * otherwise transition to the next TPKT */
@@ -267,7 +267,7 @@ rdp_parse(  const struct Banner1 *banner1,
                  * by 1. */
                 assert(bytes_parsed != 0);
                 offset += bytes_parsed - 1;
-                rdp->tpkt_length -= bytes_parsed;
+                rdp->tpkt_length -= (unsigned short)bytes_parsed;
 
                 /* If we have bytes left in the TPKT, then stay in this state,
                  * otherwise transition to the next TPKT */