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 3583ba0827c29d185f5fb03544e64e2162d72737..f5634f685543af4713e1fb5f42f988915d5b637f 100644 (file)
--- a/ssld/ssld.c
+++ b/ssld/ssld.c
@@ -815,7 +815,10 @@ process_stats(mod_ctl_t * ctl, mod_ctl_buf_t * ctlb)
                return;
 
        snprintf(outstat, sizeof(outstat), "S %s %llu %llu %llu %llu", odata,
-                   conn->plain_out, conn->mod_in, conn->plain_in, conn->mod_out);
+                       (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;
@@ -829,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;