casa-mp-base

--- webmitm.c.orig  2015-01-29 00:16:20.000000000 +0100

+++ webmitm.c   2015-01-29 00:16:44.000000000 +0100

@@ -43,7 +43,7 @@

 int     client_fd, server_fd;

 SSL_CTX    *ssl_client_ctx, *ssl_server_ctx;

 SSL    *ssl_client, *ssl_server;

-struct  sockaddr_in csin, ssin;

+struct  sockaddr_in c_sin, s_sin;

 int     do_ssl, sig_pipe[2];

 in_addr_t  static_host = 0;

@@ -101,8 +101,8 @@

    char obuf[1024];

    if ((len = decode_http(buf, len, obuf, sizeof(obuf))) > 0) {

-       record(csin.sin_addr.s_addr, ssin.sin_addr.s_addr,

-              IPPROTO_TCP, ntohs(csin.sin_port), ntohs(ssin.sin_port),

+       record(c_sin.sin_addr.s_addr, s_sin.sin_addr.s_addr,

+              IPPROTO_TCP, ntohs(c_sin.sin_port), ntohs(s_sin.sin_port),

               "http", obuf, len);

    }

 }

@@ -220,9 +220,9 @@

    char *vhost;

    int i;

-   memset(&ssin, 0, sizeof(ssin));

-   ssin.sin_family = AF_INET;

-   ssin.sin_port = do_ssl ? htons(443) : htons(80);

+   memset(&s_sin, 0, sizeof(s_sin));

+   s_sin.sin_family = AF_INET;

+   s_sin.sin_port = do_ssl ? htons(443) : htons(80);

    if (static_host == 0) {

        buf_init(&msg, buf, size);

@@ -242,20 +242,20 @@

            word = buf_tok(&msg, "/", 1);

            vhost = buf_strdup(word);

        }

-       ssin.sin_addr.s_addr = libnet_name2addr4(NULL, vhost, 1);

+       s_sin.sin_addr.s_addr = libnet_name2addr4(NULL, vhost, 1);

        free(vhost);

-       if (ssin.sin_addr.s_addr == ntohl(INADDR_LOOPBACK) ||

-           ssin.sin_addr.s_addr == -1) {

+       if (s_sin.sin_addr.s_addr == ntohl(INADDR_LOOPBACK) ||

+           s_sin.sin_addr.s_addr == -1) {

            errx(1, "couldn't resolve host in request");

        }

    }

-   else ssin.sin_addr.s_addr = static_host;

+   else s_sin.sin_addr.s_addr = static_host;

    if ((server_fd = socket(AF_INET, SOCK_STREAM, 0)) < 0)

        err(1, "socket");

-   if (connect(server_fd, (struct sockaddr *)&ssin, sizeof(ssin)) < 0)

+   if (connect(server_fd, (struct sockaddr *)&s_sin, sizeof(s_sin)) < 0)

        err(1, "connect");

    if (do_ssl) {

@@ -355,7 +355,7 @@