X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=1f2f96cc0aca244fda4bf71d31e9d8f13f6a4bd4;hb=39f6d59b4b81dc2d754329e6c9f885e8211c5e70;hp=c1a1b69f1eaf7ed2b5054fe1841cbe3b51ecfe88;hpb=de78d79db84c486afcc353884ec1770866beb653;p=tinc

diff --git a/src/connection.c b/src/connection.c
index c1a1b69f..1f2f96cc 100644
--- 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);
 	}