X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=c4c9fd4861a530f8b2c3e63a950f0b43ce50cb1a;hp=b9a3c237f51d493dd08ebf1ae53cc4c2d9ca1a61;hb=9d469a19691f9749b5d729a1ae903d7aa224a6e8;hpb=eaf1208e9d5c5a15e4b23de936830520bf3b5685

diff --git a/src/connection.c b/src/connection.c
index b9a3c237..c4c9fd48 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,7 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.eu.org>,
-                  2000-2002 Ivo Timmermans <ivo@o2w.nl>
+    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
@@ -17,41 +17,34 @@
     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.35 2002/09/10 22:12:33 guus Exp $
+    $Id$
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <syslog.h>
-#include <string.h>
-#include <sys/time.h>
-
-#include <avl_tree.h>
-#include <list.h>
+#include "system.h"
 
+#include "avl_tree.h"
+#include "conf.h"
+#include "list.h"
+#include "logger.h"
 #include "net.h"				/* Don't ask. */
 #include "netutl.h"
-#include "conf.h"
-#include <utils.h>
 #include "subnet.h"
-
+#include "utils.h"
 #include "xalloc.h"
-#include "system.h"
 
 avl_tree_t *connection_tree;	/* Meta connections */
 connection_t *broadcast;
 
-int connection_compare(connection_t *a, connection_t *b)
+static int connection_compare(const connection_t *a, const connection_t *b)
 {
-	return a - b;
+	return (void *)a - (void *)b;
 }
 
 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"));
@@ -71,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;
@@ -124,18 +117,19 @@ void dump_connections(void)
 
 	cp();
 
-	syslog(LOG_DEBUG, _("Connections:"));
+	logger(LOG_DEBUG, _("Connections:"));
 
 	for(node = connection_tree->head; node; node = node->next) {
-		c = (connection_t *) node->data;
-		syslog(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"),
-			   c->name, c->hostname, c->options, c->socket, c->status);
+		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, c->status.value,
+			   c->outbufsize, c->outbufstart, c->outbuflen);
 	}
 
-	syslog(LOG_DEBUG, _("End of connections."));
+	logger(LOG_DEBUG, _("End of connections."));
 }
 
-int read_connection_config(connection_t *c)
+bool read_connection_config(connection_t *c)
 {
 	char *fname;
 	int x;
@@ -146,5 +140,5 @@ int read_connection_config(connection_t *c)
 	x = read_config_file(c->config_tree, fname);
 	free(fname);
 
-	return x;
+	return x == 0;
 }