Commit 64abd79d authored by Robert David Graham's avatar Robert David Graham
Browse files

fixes

parent 56ded4f2

src/main-conf.c

+6 −2
Original line number Diff line number Diff line
@@ -295,6 +295,8 @@ masscan_echo(struct Masscan *masscan, FILE *fp) 
     *  TCP payloads

     */

    fprintf(fp, "\n");

    fprintf(fp, "min-packet = %u\n", masscan->min_packet_size);



    {

        struct TcpCfgPayloads *pay;

        for (pay = masscan->tcp_payloads; pay; pay = pay->next) {
@@ -656,7 +658,7 @@ masscan_set_parameter(struct Masscan *masscan, 


        /* If more than one IP address given, make the range is

            * an even power of two (1, 2, 4, 8, 16, ...) */

        if (!is_power_of_two(range.end - range.begin + 1)) {

        if (!is_power_of_two((uint64_t)range.end - range.begin + 1)) {

            LOG(0, "FAIL: range must be even power of two: %s=%s\n",

                    name, value);

            exit(1);
@@ -664,7 +666,7 @@ masscan_set_parameter(struct Masscan *masscan, 


        masscan->nic[index].src.ip.first = range.begin;

        masscan->nic[index].src.ip.last = range.end;

        masscan->nic[index].src.ip.range = range.end - range.begin + 1;

        masscan->nic[index].src.ip.range = (uint64_t)range.end - range.begin + 1;

    } else if (EQUALS("adapter-port", name) || EQUALS("source-port", name)

               || EQUALS("src-port", name)) {

        /* Send packets FROM this port number */
@@ -1040,6 +1042,8 @@ masscan_set_parameter(struct Masscan *masscan, 
    } else if (EQUALS("log-errors", name)) {

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

        exit(1);

    } else if (EQUALS("min-packet", name) || EQUALS("min-pkt", name)) {

        masscan->min_packet_size = (unsigned)parseInt(value);

    } else if (EQUALS("max-retries", name)) {

        masscan_set_parameter(masscan, "retries", value);

    } else if (EQUALS("max-rate", name)) {

src/main.c

+2 −1
Original line number Diff line number Diff line
@@ -846,7 +846,7 @@ receive_thread(void *v) 
                if (TCP_IS_FIN(px, parsed.transport_offset)

                    && !TCP_IS_RST(px, parsed.transport_offset)) {

                    tcpcon_handle(tcpcon, tcb, TCP_WHAT_FIN,

                        0, 0, secs, usecs, seqno_them);

                        0, parsed.app_length, secs, usecs, seqno_them);

                }



                /* If this is a RST, then we'll be closing the connection */
@@ -1343,6 +1343,7 @@ int main(int argc, char *argv[]) 
    masscan->nic_count = 1;

    masscan->shard.one = 1;

    masscan->shard.of = 1;

    masscan->min_packet_size = 60;

    masscan->payloads = payloads_create();

    strcpy_s(   masscan->rotate_directory,

                sizeof(masscan->rotate_directory),

src/masscan.h

+6 −0
Original line number Diff line number Diff line
@@ -206,6 +206,12 @@ struct Masscan 
     * --readscan

     */

    unsigned is_readscan:1;





    /**

     * --min-packet

     */

    unsigned min_packet_size;

};

src/proto-banner1.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ banner1_parse( 
    size_t x;

    unsigned offset = 0;





    switch (tcb_state->app_proto) {

    case PROTO_NONE:

    case PROTO_HEUR:

src/proto-banout.c

+5 −1
Original line number Diff line number Diff line
@@ -186,9 +186,13 @@ banout_append(struct BannerOutput *banout, unsigned proto, const void *px, size_ 
     */

    memcpy(p->banner + p->length, px, length);

    p->length = (unsigned)(p->length + length);

    if (p->length > 18 && memcmp(p->banner, "Invalid URLInvalid", 18) == 0) {

        printf("asldkufhasdlkfhjasdf             \n");

        exit(1);

    }

}



/***************************************************************************

/**********************************************************************bb*****

 ***************************************************************************/

int

banout_selftest(void)