Merge pull request #145 from lp0/fix-ssld-fmt-warnings-20160211

[solanum.git] / ssld / ssld.c

diff --git a/ssld/ssld.c b/ssld/ssld.c
index e18ee77accf9c5e5914774c58f2d5a0fa288346d..f5634f685543af4713e1fb5f42f988915d5b637f 100644 (file)
--- a/ssld/ssld.c
+++ b/ssld/ssld.c
@@ -209,6 +209,7 @@ free_conn(conn_t * conn)
                zlib_stream_t *stream = conn->stream;
                inflateEnd(&stream->instream);
                deflateEnd(&stream->outstream);
+               rb_free(stream);
        }
 #endif
        rb_free(conn);
@@ -255,7 +256,7 @@ close_conn(conn_t * conn, int wait_plain, const char *fmt, ...)
        rb_setselect(conn->plain_fd, RB_SELECT_READ, conn_plain_read_shutdown_cb, conn);
        rb_setselect(conn->plain_fd, RB_SELECT_WRITE, NULL, NULL);
        va_start(ap, fmt);
-       rb_vsnprintf(reason, sizeof(reason), fmt, ap);
+       vsnprintf(reason, sizeof(reason), fmt, ap);
        va_end(ap);
 
        buf[0] = 'D';
@@ -762,11 +763,9 @@ ssl_process_accept(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb)
        SetSSL(conn);
 
        if(rb_get_type(conn->mod_fd) & RB_FD_UNKNOWN)
-       {
-
                rb_set_type(conn->mod_fd, RB_FD_SOCKET);
-       }
-       if(rb_get_type(conn->mod_fd) == RB_FD_UNKNOWN)
+
+       if(rb_get_type(conn->plain_fd) == RB_FD_UNKNOWN)
                rb_set_type(conn->plain_fd, RB_FD_SOCKET);
 
        rb_ssl_start_accepted(ctlb->F[0], ssl_process_accept_cb, conn, 10);
@@ -792,7 +791,7 @@ ssl_process_connect(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb)
        if(rb_get_type(conn->mod_fd) == RB_FD_UNKNOWN)
                rb_set_type(conn->mod_fd, RB_FD_SOCKET);
 
-       if(rb_get_type(conn->mod_fd) == RB_FD_UNKNOWN)
+       if(rb_get_type(conn->plain_fd) == RB_FD_UNKNOWN)
                rb_set_type(conn->plain_fd, RB_FD_SOCKET);
 
 
@@ -815,8 +814,11 @@ process_stats(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb)
        if(conn == NULL)
                return;
 
-       rb_snprintf(outstat, sizeof(outstat), "S %s %llu %llu %llu %llu", odata,
-                   conn->plain_out, conn->mod_in, conn->plain_in, conn->mod_out);
+       snprintf(outstat, sizeof(outstat), "S %s %llu %llu %llu %llu", odata,
+                       (unsigned long long)conn->plain_out,
+                       (unsigned long long)conn->mod_in,
+                       (unsigned long long)conn->plain_in,
+                       (unsigned long long)conn->mod_out);
        conn->plain_out = 0;
        conn->plain_in = 0;
        conn->mod_in = 0;
@@ -830,6 +832,20 @@ change_connid(mod_ctl_t *ctl, mod_ctl_buf_t *ctlb)
        uint32_t id = buf_to_uint32(&ctlb->buf[1]);
        uint32_t newid = buf_to_uint32(&ctlb->buf[5]);
        conn_t *conn = conn_find_by_id(id);
+       lrb_assert(conn != NULL);
+       if(conn == NULL)
+       {
+               uint8_t buf[256];
+               int len;
+
+               buf[0] = 'D';
+               uint32_to_buf(&buf[1], newid);
+               sprintf((char *) &buf[5], "connid %d does not exist", id);
+               len = (strlen((char *) &buf[5]) + 1) + 5;
+               mod_cmd_write_queue(ctl, buf, len);
+
+               return;
+       }
        rb_dlinkDelete(&conn->node, connid_hash(conn->id));
        SetZipSSL(conn);
        conn->id = newid;
@@ -910,7 +926,7 @@ static void
 ssl_new_keys(mod_ctl_t * ctl, mod_ctl_buf_t * ctl_buf)
 {
        char *buf;
-       char *cert, *key, *dhparam;
+       char *cert, *key, *dhparam, *cipher_list;
 
        buf = (char *) &ctl_buf->buf[2];
        cert = buf;
@@ -920,8 +936,12 @@ ssl_new_keys(mod_ctl_t * ctl, mod_ctl_buf_t * ctl_buf)
        dhparam = buf;
        if(strlen(dhparam) == 0)
                dhparam = NULL;
+       buf += strlen(dhparam) + 1;
+       cipher_list = buf;
+       if(strlen(cipher_list) == 0)
+               cipher_list = NULL;
 
-       if(!rb_setup_ssl_server(cert, key, dhparam))
+       if(!rb_setup_ssl_server(cert, key, dhparam, cipher_list))
        {
                const char *invalid = "I";
                mod_cmd_write_queue(ctl, invalid, strlen(invalid));