Commit ba621b1c authored by Robert David Graham's avatar Robert David Graham
Browse files

vlan

parent 95ba35e8

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ endif 
ifneq (, $(findstring darwin, $(SYS)))

LIBS = -lpcap -lm -rdynamic

INCLUDES = -I.

FLAGS2 = -fsanitize=address

FLAGS2 = 

INSTALL_DATA = -pm755

endif

src/main-conf.c

+4 −0
Original line number Diff line number Diff line
@@ -1598,6 +1598,10 @@ masscan_set_parameter(struct Masscan *masscan, 
    } else if (EQUALS("version-trace", name)) {

        fprintf(stderr, "nmap(%s): unsupported\n", name);

        exit(1);

    } else if (EQUALS("vlan", name)) {

        masscan->nic[index].is_vlan = 1;

        masscan->nic[index].vlan_id = parseInt(value);

        printf("using vlan = 0x%08x\n", masscan->nic[index].vlan_id);

    } else if (EQUALS("wait", name)) {

        if (EQUALS("forever", value))

            masscan->wait =  INT_MAX;

src/main-initadapter.c

+4 −1
Original line number Diff line number Diff line
@@ -125,7 +125,9 @@ masscan_initialize_adapter( 
                                            masscan->is_sendq,

                                            masscan->nmap.packet_trace,

                                            masscan->is_offline,

                                            masscan->bpf_filter);

                                            (void*)masscan->bpf_filter,

                                            masscan->nic[index].is_vlan,

                                            masscan->nic[index].vlan_id);

    if (masscan->nic[index].adapter == 0) {

        fprintf(stderr, "adapter[%s].init: failed\n", ifname);

        return -1;
@@ -135,6 +137,7 @@ masscan_initialize_adapter( 
    LOG(3, "rawsock: initialization done\n");







    /*

     * ROUTER MAC ADDRESS

     *

src/masscan.h

+3 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ struct Masscan 
        unsigned router_ip;

        int link_type; /* libpcap definitions */

        unsigned char my_mac_count;

        unsigned vlan_id;

        unsigned is_vlan:1;

    } nic[8];

    unsigned nic_count;
@@ -174,6 +176,7 @@ struct Masscan 
    unsigned is_readscan:1;     /* --readscan, Operation_Readscan */

    unsigned is_heartbleed:1;   /* --heartbleed, scan for this vuln */

        



    /**

     * Wait forever for responses, instead of the default 10 seconds

     */

src/rawsock-adapter.h

0 → 100644
+16 −0
Original line number Diff line number Diff line 
#ifndef RAWSOCK_ADAPTER_H

#define RAWSOCK_ADAPTER_H



struct Adapter

{

    struct pcap *pcap;

    struct pcap_send_queue *sendq;

    struct __pfring *ring;

    unsigned is_packet_trace:1; /* is --packet-trace option set? */

    unsigned is_vlan:1;

    unsigned vlan_id;

    double pt_start;

    int link_type;

};



#endif