Commit 056ca5b3 authored by Robert David Graham's avatar Robert David Graham
Browse files

warnings

parent 149b142a
Loading
Loading
Loading
Loading
+5
Changes for src/main-conf.c: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -903,10 +903,15 @@ static int SET_hello(struct Masscan *masscan, const char *name, const char *valu
        if (masscan->is_hello_ssl) {
            fprintf(masscan->echo, "hello = ssl\n");
        }
        if (masscan->is_hello_smbv1) {
            fprintf(masscan->echo, "hello = smbv1\n");
        }
        return 0;
    }
    if (EQUALS("ssl", value))
        masscan->is_hello_ssl = 1;
    else if (EQUALS("smbv1", value))
        masscan->is_hello_smbv1 = 1;
    else {
        fprintf(stderr, "FAIL: %s: unknown hello type\n", value);
        return CONF_ERR;
+5
Changes for src/main.c: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -621,6 +621,11 @@ receive_thread(void *v)
                                    "http-user-agent",
                                    masscan->http_user_agent_length,
                                    masscan->http_user_agent);
        if (masscan->is_hello_smbv1)
            tcpcon_set_parameter(   tcpcon,
                                 "hello",
                                 1,
                                 "smbv1");
        if (masscan->is_hello_ssl)
            tcpcon_set_parameter(   tcpcon,
                                 "hello",
+1
Changes for src/masscan.h: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -201,6 +201,7 @@ struct Masscan
    unsigned is_ticketbleed:1;  /* --ticketbleed, scan for this vuln */
    unsigned is_poodle_sslv3:1; /* --script poodle, scan for this vuln */
    unsigned is_hello_ssl:1;    /* --ssl, use SSL HELLO on all ports */
    unsigned is_hello_smbv1:1;  /* --smbv1, use SMBv1 hello, instead of v1/v2 hello */
        
    /**
     * Wait forever for responses, instead of the default 10 seconds
+17
Changes for src/proto-interactive.c: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line
#include "proto-interactive.h"
#include <stdlib.h>

/*
 * TODO: we need to track thie memory used for this better than with malloc(), such
 * as usuing a preallocated array of packet buffers. But for now, I'm just using
 * malloc() 'cause I'm a lazy programmer.
 */
unsigned char *
tcp_transmit_alloc(struct InteractiveData *more, size_t length)
{
    return malloc(length);
}


/*
 * This doesn't actually transmit right now. Instead, marks the payload as ready
 * to transmit, which will be transmitted later
 */
void
tcp_transmit(struct InteractiveData *more, const void *payload, size_t length, unsigned flags)
{
+10
Changes for src/proto-interactive.h: 10 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -10,7 +10,17 @@ struct InteractiveData {
enum {
    TCPTRAN_DYNAMIC = 0x0001,
};

/**
 * Called to 'transmit' TCP packet payload.
 */
void
tcp_transmit(struct InteractiveData *more, const void *data, size_t length, unsigned flags);

/**
 * Called to allocate a TCP buffer.
 */
unsigned char *
tcp_transmit_alloc(struct InteractiveData *more, size_t length);

#endif
Loading