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

diff --git a/src/connection.c b/src/connection.c
index bb9e336d..1f2f96cc 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,7 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+                  2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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);
 	}