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

diff --git a/src/connection.c b/src/connection.c
index 1f2f96cc..ce4c7536 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,8 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2006 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 "avl_tree.h"
+#include "splay_tree.h"
+#include "cipher.h"
 #include "conf.h"
 #include "list.h"
 #include "logger.h"
@@ -32,106 +32,86 @@
 #include "utils.h"
 #include "xalloc.h"
 
-avl_tree_t *connection_tree;	/* Meta connections */
+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;
+static int connection_compare(const connection_t *a, const connection_t *b) {
+	return a < b ? -1 : a == b ? 0 : 1;
 }
 
-void init_connections(void)
-{
-	cp();
-
-	connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection);
+void init_connections(void) {
+	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();
-
-	avl_delete_tree(connection_tree);
+void exit_connections(void) {
+	splay_delete_tree(connection_tree);
 	free_connection(broadcast);
 }
 
-connection_t *new_connection(void)
-{
-	connection_t *c;
-
-	cp();
-
-	c = xmalloc_and_zero(sizeof(connection_t));
+connection_t *new_connection(void) {
+	return xmalloc_and_zero(sizeof(connection_t));
+}
 
+void free_connection(connection_t *c) {
 	if(!c)
-		return NULL;
+		return;
 
-	gettimeofday(&c->start, NULL);
-	event_set(&c->ev, -1, 0, NULL, NULL);
+	if(c->name)
+		free(c->name);
 
-	return c;
-}
+	if(c->hostname)
+		free(c->hostname);
 
-void free_connection(connection_t *c)
-{
-	cp();
+	cipher_close(&c->incipher);
+	cipher_close(&c->outcipher);
 
-	if(c) {
-		free(c->hostname);
-		free(c->inkey);
-		free(c->outkey);
-		free(c->mychallenge);
+	if(c->hischallenge)
 		free(c->hischallenge);
-		event_del(&c->ev);
-	}
 
-	free(c);
-}
+	if(c->config_tree)
+		exit_configuration(&c->config_tree);
 
-void connection_add(connection_t *c)
-{
-	cp();
+	if(c->buffer)
+		bufferevent_free(c->buffer);
+	
+	if(event_initialized(&c->inevent))
+		event_del(&c->inevent);
 
-	avl_insert(connection_tree, c);
+	free(c);
 }
 
-void connection_del(connection_t *c)
-{
-	cp();
+void connection_add(connection_t *c) {
+	splay_insert(connection_tree, c);
+}
 
-	avl_delete(connection_tree, c);
+void connection_del(connection_t *c) {
+	splay_delete(connection_tree, c);
 }
 
-void dump_connections(void)
-{
-	avl_node_t *node;
+int dump_connections(struct evbuffer *out) {
+	splay_node_t *node;
 	connection_t *c;
 
-	cp();
-
-	logger(LOG_DEBUG, _("Connections:"));
-
 	for(node = connection_tree->head; node; node = node->next) {
 		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);
+		if(evbuffer_add_printf(out,
+				   " %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;
 	}
 
-	logger(LOG_DEBUG, _("End of connections."));
+	return 0;
 }
 
-bool read_connection_config(connection_t *c)
-{
+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);