Only free members of connection_t that have been allocated.

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index c1a1b69f1eaf7ed2b5054fe1841cbe3b51ecfe88..b6ce517e152cb69570c13c1a41f5f4320fb8daf4 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -70,6 +70,7 @@ connection_t *new_connection(void)
                return NULL;
 
        gettimeofday(&c->start, NULL);
+       event_set(&c->ev, -1, 0, NULL, NULL);
 
        return c;
 }
@@ -78,6 +79,9 @@ void free_connection(connection_t *c)
 {
        cp();
 
+       if(!c)
+               return;
+
        if(c->hostname)
                free(c->hostname);
 
@@ -93,6 +97,7 @@ void free_connection(connection_t *c)
        if(c->hischallenge)
                free(c->hischallenge);
 
+       event_del(&c->ev);
        free(c);
 }
 
@@ -122,7 +127,7 @@ void dump_connections(void)
        for(node = connection_tree->head; node; node = node->next) {
                c = node->data;
                logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x outbuf %d/%d/%d"),
-                          c->name, c->hostname, c->options, c->socket, *(uint32_t *)&c->status,
+                          c->name, c->hostname, c->options, c->socket, c->status.value,
                           c->outbufsize, c->outbufstart, c->outbuflen);
        }