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

diff --git a/src/connection.c b/src/connection.c
index b9a3c237..21cb6aa9 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-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,74 +17,59 @@
     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.35 2002/09/10 22:12:33 guus Exp $
+    $Id$
 */
 
-#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 "splay_tree.h"
+#include "conf.h"
+#include "list.h"
+#include "logger.h"
 #include "net.h"				/* Don't ask. */
 #include "netutl.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 */
+splay_tree_t *connection_tree;	/* Meta connections */
 connection_t *broadcast;
 
-int connection_compare(connection_t *a, connection_t *b)
-{
-	return a - 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, NULL);
+	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 = (connection_t *) xmalloc_and_zero(sizeof(connection_t));
-
-	if(!c)
-		return NULL;
-
-	gettimeofday(&c->start, 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)
+		return;
+
+	if(c->name)
+		free(c->name);
+
 	if(c->hostname)
 		free(c->hostname);
 
@@ -100,43 +85,45 @@ void free_connection(connection_t *c)
 	if(c->hischallenge)
 		free(c->hischallenge);
 
+	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();
 
-	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 status %04x"),
+			   c->name, c->hostname, c->options, c->socket, c->status.value);
 	}
 
-	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;
 
@@ -146,5 +133,5 @@ int read_connection_config(connection_t *c)
 	x = read_config_file(c->config_tree, fname);
 	free(fname);
 
-	return x;
+	return x == 0;
 }