X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fconnection.c;h=9e5d145ea200295ae989c27bc1cb1d16a995e56f;hp=eba74ae425825ea1932916c45ca58a35a04f1792;hb=56c36a14d87b58c14dbc48df4d3d977207e2c06e;hpb=eefa28059ab989c915a7d95fb4ae728abd7ce713

diff --git a/src/connection.c b/src/connection.c
index eba74ae..9e5d145 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,7 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2003 Guus Sliepen <guus@sliepen.eu.org>,
-                  2000-2003 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2000-2004 Guus Sliepen <guus@tinc-vpn.org>,
+                  2000-2004 Ivo Timmermans <ivo@tinc-vpn.org>
 
     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
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: connection.c,v 1.1.2.41 2003/07/22 20:55:19 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -35,7 +35,7 @@
 avl_tree_t *connection_tree;	/* Meta connections */
 connection_t *broadcast;
 
-static int connection_compare(connection_t *a, connection_t *b)
+static int connection_compare(const connection_t *a, const connection_t *b)
 {
 	return (void *)a - (void *)b;
 }
@@ -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"));
@@ -64,7 +64,7 @@ connection_t *new_connection(void)
 
 	cp();
 
-	c = (connection_t *) xmalloc_and_zero(sizeof(connection_t));
+	c = xmalloc_and_zero(sizeof(connection_t));
 
 	if(!c)
 		return NULL;
@@ -120,9 +120,9 @@ void dump_connections(void)
 	logger(LOG_DEBUG, _("Connections:"));
 
 	for(node = connection_tree->head; node; node = node->next) {
-		c = (connection_t *) node->data;
+		c = node->data;
 		logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"),
-			   c->name, c->hostname, c->options, c->socket, c->status);
+			   c->name, c->hostname, c->options, c->socket, *(uint32_t *)&c->status);
 	}
 
 	logger(LOG_DEBUG, _("End of connections."));