X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconnection.c;h=1f2f96cc0aca244fda4bf71d31e9d8f13f6a4bd4;hb=38c25d62c2bc76908bd95fb21c8f5e39ad269884;hp=60dd541119eeaf498c0f1562626a50ac34efaf3c;hpb=7926a156e5b118d06295228e57de0cc9de0433b4;p=meshlink

diff --git a/src/connection.c b/src/connection.c
index 60dd5411..1f2f96cc 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,7 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2004 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2004 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
@@ -44,7 +44,7 @@ void init_connections(void)
 {
 	cp();
 
-	connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, NULL);
+	connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection);
 	broadcast = new_connection();
 	broadcast->name = xstrdup(_("everyone"));
 	broadcast->hostname = xstrdup(_("BROADCAST"));
@@ -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);
 }
@@ -121,8 +116,9 @@ 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"),
-			   c->name, c->hostname, c->options, c->socket, *(uint32_t *)&c->status);
+		logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x outbuf %d/%d/%d"),
+			   c->name, c->hostname, c->options, c->socket, c->status.value,
+			   c->outbufsize, c->outbufstart, c->outbuflen);
 	}
 
 	logger(LOG_DEBUG, _("End of connections."));