X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=4d036edf3f94c5d9542295786cdae1b450552e5f;hb=refs%2Fheads%2F1.0-gnutls;hp=a35d4f0a8083e0d4850e28da391127a730186fa7;hpb=6f9f6779e6bd1dd7bb795b42dad550863a386ca8;p=tinc

diff --git a/src/connection.c b/src/connection.c
index a35d4f0a..4d036edf 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,35 +17,27 @@
     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.34 2002/09/09 22:32:30 guus Exp $
+    $Id: connection.c,v 1.1.2.44 2003/08/28 21:05:10 guus Exp $
 */
 
-#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 "config.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)
@@ -72,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;
@@ -86,21 +78,6 @@ void free_connection(connection_t *c)
 {
 	cp();
 
-	if(c->hostname)
-		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);
-
 	free(c);
 }
 
@@ -125,18 +102,23 @@ 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 cipher %s digest %s compression %s kx method %s status %04x"),
+				c->name, c->hostname, c->options, c->socket,
+				c->session ? gnutls_cipher_get_name(gnutls_cipher_get(c->session)) : "-",
+				c->session ? gnutls_mac_get_name(gnutls_mac_get(c->session)) : "-",
+				c->session ? gnutls_compression_get_name(gnutls_compression_get(c->session)) : "-",
+				c->session ? gnutls_kx_get_name(gnutls_kx_get(c->session)) : "-",
+			   *(uint32_t *)&c->status);
 	}
 
-	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;
@@ -147,5 +129,5 @@ int read_connection_config(connection_t *c)
 	x = read_config_file(c->config_tree, fname);
 	free(fname);
 
-	return x;
+	return x == 0;
 }