X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconnection.c;h=21cb6aa93398229ad9bb848134d23557104c6ac9;hb=40731d030fef793c6b6405efd9b3e64c26c00045;hp=1f2f96cc0aca244fda4bf71d31e9d8f13f6a4bd4;hpb=38c25d62c2bc76908bd95fb21c8f5e39ad269884;p=meshlink

diff --git a/src/connection.c b/src/connection.c
index 1f2f96cc..21cb6aa9 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,6 +1,6 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    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
@@ -22,7 +22,7 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "conf.h"
 #include "list.h"
 #include "logger.h"
@@ -32,82 +32,82 @@
 #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)
-{
+static int connection_compare(const connection_t *a, const connection_t *b) {
 	return (void *)a - (void *)b;
 }
 
-void init_connections(void)
-{
+void init_connections(void) {
 	cp();
 
-	connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection);
+	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"));
 }
 
-void exit_connections(void)
-{
+void exit_connections(void) {
 	cp();
 
-	avl_delete_tree(connection_tree);
+	splay_delete_tree(connection_tree);
 	free_connection(broadcast);
 }
 
-connection_t *new_connection(void)
-{
-	connection_t *c;
-
+connection_t *new_connection(void) {
 	cp();
 
-	c = xmalloc_and_zero(sizeof(connection_t));
-
-	if(!c)
-		return NULL;
-
-	gettimeofday(&c->start, NULL);
-	event_set(&c->ev, -1, 0, NULL, NULL);
-
-	return c;
+	return xmalloc_and_zero(sizeof(connection_t));
 }
 
-void free_connection(connection_t *c)
-{
+void free_connection(connection_t *c) {
 	cp();
 
-	if(c) {
+	if(!c)
+		return;
+
+	if(c->name)
+		free(c->name);
+
+	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);
-		event_del(&c->ev);
-	}
+
+	if(c->buffer)
+		bufferevent_free(c->buffer);
+	
+	if(event_initialized(&c->inevent))
+		event_del(&c->inevent);
 
 	free(c);
 }
 
-void connection_add(connection_t *c)
-{
+void connection_add(connection_t *c) {
 	cp();
 
-	avl_insert(connection_tree, c);
+	splay_insert(connection_tree, c);
 }
 
-void connection_del(connection_t *c)
-{
+void connection_del(connection_t *c) {
 	cp();
 
-	avl_delete(connection_tree, c);
+	splay_delete(connection_tree, c);
 }
 
-void dump_connections(void)
-{
-	avl_node_t *node;
+void dump_connections(void) {
+	splay_node_t *node;
 	connection_t *c;
 
 	cp();
@@ -116,16 +116,14 @@ void dump_connections(void)
 
 	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);
+		logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"),
+			   c->name, c->hostname, c->options, c->socket, c->status.value);
 	}
 
 	logger(LOG_DEBUG, _("End of connections."));
 }
 
-bool read_connection_config(connection_t *c)
-{
+bool read_connection_config(connection_t *c) {
 	char *fname;
 	int x;