Convert to libevent.

[tinc] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index c1a1b69..1f2f96c 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,20 +79,14 @@ void free_connection(connection_t *c)
 {
        cp();
 
-       if(c->hostname)
+       if(c) {
                free(c->hostname);
-
-       if(c->inkey)
                free(c->inkey);
-
-       if(c->outkey)
                free(c->outkey);
-
-       if(c->mychallenge)
                free(c->mychallenge);
-
-       if(c->hischallenge)
                free(c->hischallenge);
+               event_del(&c->ev);
+       }
 
        free(c);
 }
@@ -122,7 +117,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);
        }