Commit 56b42ead authored by Robert David Graham's avatar Robert David Graham
Browse files

config changes

parent 79610ed3
Loading
Loading
Loading
Loading
+892 −541

File changed.

Preview size limit exceeded, changes collapsed.

+1 −1
Changes for src/main.c: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -786,7 +786,7 @@ receive_thread(void *v)
                     * than port scanning them */

                    /* If we aren't doing an ARP scan, then ignore ARP responses */
                    if (!masscan->is_arp)
                    if (!masscan->scan_type.arp)
                        break;

                    /* If this response isn't in our range, then ignore it */
+12 −5
Changes for src/masscan.h: 12 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ enum Operation {
 * outputing simultaneously.
 */
enum OutputFormat {
    Output_Default      = 0x0000,
    Output_Interactive  = 0x0001,   /* --interactive, print to cmdline */
    Output_List         = 0x0002,
    Output_Binary       = 0x0004,   /* -oB, "binary", the primary format */
@@ -100,8 +101,8 @@ struct Masscan
        unsigned tcp:1;
        unsigned udp:1;
        unsigned sctp:1;
        unsigned ping:1;
        unsigned arp:1; /*TODO*/
        unsigned ping:1; /* --ping, ICMP echo */
        unsigned arp:1; /* --arp, local ARP scan */
    } scan_type;
    
    /**
@@ -109,6 +110,13 @@ struct Masscan
     */
    unsigned top_ports;
    
    /**
     * Temporary file to echo parameters to, used for saving configuration
     * to a file
     */
    FILE *echo;
    unsigned echo_all;

    /**
     * One or more network adapters that we'll use for scanning. Each adapter
     * should have a separate set of IP source addresses, except in the case
@@ -123,7 +131,7 @@ struct Masscan
        unsigned char router_mac[6];
        unsigned router_ip;
        int link_type; /* libpcap definitions */
        unsigned char my_mac_count;
        unsigned char my_mac_count; /*is there a MAC address? */
        unsigned vlan_id;
        unsigned is_vlan:1;
    } nic[8];
@@ -180,8 +188,7 @@ struct Masscan
    unsigned is_sendq:1;        /* --sendq */
    unsigned is_banners:1;      /* --banners */
    unsigned is_offline:1;      /* --offline */
    unsigned is_arp:1;          /* --arp */
    unsigned is_noreset:1;      /* --noreset */
    unsigned is_noreset:1;      /* --noreset, don't transmit RST */
    unsigned is_gmt:1;          /* --gmt, all times in GMT */
    unsigned is_capture_cert:1; /* --capture cert */
    unsigned is_capture_html:1; /* --capture html */