X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=283ebd7127d2462a8cc3ff3b3ddedf3347f659b6;hp=ccec2ed846398a8cedf5885d7e2d3a769796db06;hb=75773efe2689d347a2f219c5f27e4a82eef1236b;hpb=83263b74460656ba557fd9bb84dc27258549e9cd

diff --git a/src/connection.c b/src/connection.c
index ccec2ed8..283ebd71 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-2007 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,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.42 2003/07/24 12:08:15 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -37,14 +37,14 @@ connection_t *broadcast;
 
 static int connection_compare(const connection_t *a, const connection_t *b)
 {
-	return (void *)a - (void *)b;
+	return a < b ? -1 : a == b ? 0 : 1;
 }
 
 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;
@@ -78,6 +78,9 @@ void free_connection(connection_t *c)
 {
 	cp();
 
+	if(c->name)
+		free(c->name);
+
 	if(c->hostname)
 		free(c->hostname);
 
@@ -87,12 +90,31 @@ void free_connection(connection_t *c)
 	if(c->outkey)
 		free(c->outkey);
 
+	if(c->inctx) {
+		EVP_CIPHER_CTX_cleanup(c->inctx);
+		free(c->inctx);
+	}
+
+	if(c->outctx) {
+		EVP_CIPHER_CTX_cleanup(c->outctx);
+		free(c->outctx);
+	}
+
 	if(c->mychallenge)
 		free(c->mychallenge);
 
 	if(c->hischallenge)
 		free(c->hischallenge);
 
+	if(c->config_tree)
+		exit_configuration(&c->config_tree);
+
+	if(c->outbuf)
+		free(c->outbuf);
+
+	if(c->rsa_key)
+		RSA_free(c->rsa_key);
+
 	free(c);
 }
 
@@ -120,9 +142,10 @@ void dump_connections(void)
 	logger(LOG_DEBUG, _("Connections:"));
 
 	for(node = connection_tree->head; node; node = node->next) {
-		c = (connection_t *) 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 = 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, bitfield_to_int(&c->status, sizeof c->status),
+			   c->outbufsize, c->outbufstart, c->outbuflen);
 	}
 
 	logger(LOG_DEBUG, _("End of connections."));
@@ -135,7 +158,7 @@ bool read_connection_config(connection_t *c)
 
 	cp();
 
-	asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
 	x = read_config_file(c->config_tree, fname);
 	free(fname);