Commit 6deba76f authored by Robert Graham's avatar Robert Graham
Browse files
parents d13e6766 99cbcd76
Loading
Loading
Loading
Loading
+981 −575

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 */
+2
Changes for src/masscan-app.c: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ masscan_app_to_string(enum ApplicationProtocol proto)
    case PROTO_SNMP: return "snmp";
    case PROTO_NBTSTAT: return "nbtstat";
    case PROTO_SSL3:    return "ssl";
    case PROTO_SMB:     return "smb";
    case PROTO_SMTP:    return "smtp";
    case PROTO_POP3:    return "pop";
    case PROTO_IMAP4:   return "imap";
@@ -61,6 +62,7 @@ masscan_string_to_app(const char *str)
        {"ssh2",    PROTO_SSH2},
        {"nbtstat", PROTO_NBTSTAT},
        {"ssl",     PROTO_SSL3},
        {"smb",     PROTO_SMB},
        {"pop",     PROTO_POP3},
        {"imap",    PROTO_IMAP4},
        {"x509",    PROTO_X509_CERT},
+5
Changes for src/masscan-app.h: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ enum ApplicationProtocol {
    PROTO_SNMP,             /* simple network management protocol, udp/161 */
    PROTO_NBTSTAT,          /* netbios, udp/137 */
    PROTO_SSL3,
    PROTO_SMB,              /* SMB tcp/139 and tcp/445 */
    PROTO_SMTP,
    PROTO_POP3,
    PROTO_IMAP4,
@@ -30,6 +31,10 @@ enum ApplicationProtocol {
    PROTO_VNC_RFB,
    PROTO_SAFE,
    PROTO_MEMCACHED,
    
    
    
    PROTO_end_of_list /* must be last one */
};

const char *
+17 −4
Changes for src/masscan.h: 17 added lines, 4 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,9 +101,22 @@ struct Masscan
        unsigned tcp:1;
        unsigned udp:1;
        unsigned sctp:1;
        unsigned ping:1;
        unsigned ping:1; /* --ping, ICMP echo */
        unsigned arp:1; /* --arp, local ARP scan */
    } scan_type;
    
    /**
     * After scan type has been configured, add these ports
     */
    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
@@ -117,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];
@@ -174,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 */
Loading