X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=ce4c7536e3c2e76c545052d8d1fd22720081769f;hb=7ea85043ac1fb2096baea44f6b0af27ac0d0b2cf;hp=06f51b50aac3e4b55dfe14ffa89d7c0321a83ee6;hpb=6eaefb4dbce240334e35f67d9f3db5d4f44e49c9;p=tinc

diff --git a/src/connection.c b/src/connection.c
index 06f51b50..ce4c7536 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,8 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2007 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
+                  2008      Max Rijevski <maksuf@gmail.com>
 
     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
@@ -13,16 +14,15 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
 
 #include "splay_tree.h"
+#include "cipher.h"
 #include "conf.h"
 #include "list.h"
 #include "logger.h"
@@ -36,34 +36,26 @@ splay_tree_t *connection_tree;	/* Meta connections */
 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 = splay_alloc_tree((splay_compare_t) connection_compare, (splay_action_t) free_connection);
 	broadcast = new_connection();
-	broadcast->name = xstrdup(_("everyone"));
-	broadcast->hostname = xstrdup(_("BROADCAST"));
+	broadcast->name = xstrdup("everyone");
+	broadcast->hostname = xstrdup("BROADCAST");
 }
 
 void exit_connections(void) {
-	cp();
-
 	splay_delete_tree(connection_tree);
 	free_connection(broadcast);
 }
 
 connection_t *new_connection(void) {
-	cp();
-
 	return xmalloc_and_zero(sizeof(connection_t));
 }
 
 void free_connection(connection_t *c) {
-	cp();
-
 	if(!c)
 		return;
 
@@ -73,18 +65,15 @@ void free_connection(connection_t *c) {
 	if(c->hostname)
 		free(c->hostname);
 
-	if(c->inkey)
-		free(c->inkey);
-
-	if(c->outkey)
-		free(c->outkey);
-
-	if(c->mychallenge)
-		free(c->mychallenge);
+	cipher_close(&c->incipher);
+	cipher_close(&c->outcipher);
 
 	if(c->hischallenge)
 		free(c->hischallenge);
 
+	if(c->config_tree)
+		exit_configuration(&c->config_tree);
+
 	if(c->buffer)
 		bufferevent_free(c->buffer);
 	
@@ -95,14 +84,10 @@ void free_connection(connection_t *c) {
 }
 
 void connection_add(connection_t *c) {
-	cp();
-
 	splay_insert(connection_tree, c);
 }
 
 void connection_del(connection_t *c) {
-	cp();
-
 	splay_delete(connection_tree, c);
 }
 
@@ -110,14 +95,12 @@ int dump_connections(struct evbuffer *out) {
 	splay_node_t *node;
 	connection_t *c;
 
-	cp();
-
 	for(node = connection_tree->head; node; node = node->next) {
 		c = node->data;
 		if(evbuffer_add_printf(out,
-							   _(" %s at %s options %lx socket %d status %04x\n"),
-							   c->name, c->hostname, c->options, c->socket,
-							   c->status.value) == -1)
+				   " %s at %s options %lx socket %d status %04x\n",
+				   c->name, c->hostname, c->options, c->socket,
+				   bitfield_to_int(&c->status, sizeof c->status)) == -1)
 			return errno;
 	}
 
@@ -128,9 +111,7 @@ bool read_connection_config(connection_t *c) {
 	char *fname;
 	int x;
 
-	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);