X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=dbfe6d655016f072fa58483717f1dad1b91c9635;hp=089ff0de1babbdb5717d8382e2366e5d560fb058;hb=5db596c6844169f1eb5f804b72abe99d067aaa5a;hpb=f75dcef72a81a337e847adf0bae54198894f65b9

diff --git a/src/connection.c b/src/connection.c
index 089ff0de..dbfe6d65 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-2003 Guus Sliepen <guus@sliepen.eu.org>,
+                  2000-2003 Ivo Timmermans <ivo@o2w.nl>
 
     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,13 +17,12 @@
     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.33 2002/09/09 21:24:31 guus Exp $
+    $Id: connection.c,v 1.1.2.39 2003/07/12 17:41:45 guus Exp $
 */
 
 #include "config.h"
 
 #include <stdio.h>
-#include <syslog.h>
 #include <string.h>
 #include <sys/time.h>
 
@@ -32,10 +31,10 @@
 
 #include "net.h"				/* Don't ask. */
 #include "netutl.h"
-#include "config.h"
 #include "conf.h"
 #include <utils.h>
 #include "subnet.h"
+#include "logger.h"
 
 #include "xalloc.h"
 #include "system.h"
@@ -43,9 +42,9 @@
 avl_tree_t *connection_tree;	/* Meta connections */
 connection_t *broadcast;
 
-int connection_compare(connection_t * a, connection_t * b)
+static int connection_compare(connection_t *a, connection_t *b)
 {
-	return a - b;
+	return (void *)a - (void *)b;
 }
 
 void init_connections(void)
@@ -82,7 +81,7 @@ connection_t *new_connection(void)
 	return c;
 }
 
-void free_connection(connection_t * c)
+void free_connection(connection_t *c)
 {
 	cp();
 
@@ -104,14 +103,14 @@ void free_connection(connection_t * c)
 	free(c);
 }
 
-void connection_add(connection_t * c)
+void connection_add(connection_t *c)
 {
 	cp();
 
 	avl_insert(connection_tree, c);
 }
 
-void connection_del(connection_t * c)
+void connection_del(connection_t *c)
 {
 	cp();
 
@@ -125,18 +124,18 @@ 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"),
+		logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"),
 			   c->name, c->hostname, c->options, c->socket, c->status);
 	}
 
-	syslog(LOG_DEBUG, _("End of connections."));
+	logger(LOG_DEBUG, _("End of connections."));
 }
 
-int read_connection_config(connection_t * c)
+int read_connection_config(connection_t *c)
 {
 	char *fname;
 	int x;