X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=0c5e7ef0297468b25bc0f9fac2109276856b345f;hb=0871c3095151bce6a4031a2662aa51b7193b855c;hp=7999b6fb08a28ef1146324f2890f11f93f43ff57;hpb=ce059e36fdb3d3049c278e8b2f36b03c93778996;p=tinc

diff --git a/src/connection.c b/src/connection.c
index 7999b6fb..0c5e7ef0 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,6 +1,6 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2013 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
                   2008      Max Rijevski <maksuf@gmail.com>
 
@@ -21,93 +21,98 @@
 
 #include "system.h"
 
-#include "splay_tree.h"
+#include "list.h"
 #include "cipher.h"
 #include "conf.h"
 #include "control_common.h"
-#include "list.h"
 #include "logger.h"
-#include "subnet.h"
+#include "net.h"
+#include "rsa.h"
 #include "utils.h"
 #include "xalloc.h"
 
-splay_tree_t *connection_tree;	/* Meta connections */
-connection_t *everyone;
+list_t connection_list = {
+	.head = NULL,
+	.tail = NULL,
+	.count = 0,
+	.delete = (list_action_t) free_connection,
+};
 
-static int connection_compare(const connection_t *a, const connection_t *b) {
-	return a < b ? -1 : a == b ? 0 : 1;
-}
+connection_t *everyone;
 
 void init_connections(void) {
-	connection_tree = splay_alloc_tree((splay_compare_t) connection_compare, (splay_action_t) free_connection);
 	everyone = new_connection();
 	everyone->name = xstrdup("everyone");
 	everyone->hostname = xstrdup("BROADCAST");
 }
 
 void exit_connections(void) {
-	splay_delete_tree(connection_tree);
+	list_empty_list(&connection_list);
+
 	free_connection(everyone);
+	everyone = NULL;
 }
 
 connection_t *new_connection(void) {
-	return xmalloc_and_zero(sizeof(connection_t));
+	return xzalloc(sizeof(connection_t));
 }
 
 void free_connection(connection_t *c) {
-	if(!c)
+	if(!c) {
 		return;
+	}
 
-	cipher_close(&c->incipher);
-	digest_close(&c->indigest);
-	cipher_close(&c->outcipher);
-	digest_close(&c->outdigest);
+#ifndef DISABLE_LEGACY
+	cipher_close(c->incipher);
+	digest_close(c->indigest);
+	cipher_close(c->outcipher);
+	digest_close(c->outdigest);
+	rsa_free(c->rsa);
+#endif
 
 	sptps_stop(&c->sptps);
-	ecdsa_free(&c->ecdsa);
-	rsa_free(&c->rsa);
+	ecdsa_free(c->ecdsa);
 
 	free(c->hischallenge);
+	free(c->mychallenge);
 
 	buffer_clear(&c->inbuf);
 	buffer_clear(&c->outbuf);
-	
-	if(event_initialized(&c->inevent))
-		event_del(&c->inevent);
 
-	if(event_initialized(&c->outevent))
-		event_del(&c->outevent);
+	io_del(&c->io);
 
-	if(c->socket > 0)
-		closesocket(c->socket);
+	if(c->socket > 0) {
+		if(c->status.tarpit) {
+			tarpit(c->socket);
+		} else {
+			closesocket(c->socket);
+		}
+	}
 
 	free(c->name);
 	free(c->hostname);
 
-	if(c->config_tree)
+	if(c->config_tree) {
 		exit_configuration(&c->config_tree);
+	}
 
 	free(c);
 }
 
 void connection_add(connection_t *c) {
-	splay_insert(connection_tree, c);
+	list_insert_tail(&connection_list, c);
 }
 
 void connection_del(connection_t *c) {
-	splay_delete(connection_tree, c);
+	list_delete(&connection_list, c);
 }
 
 bool dump_connections(connection_t *cdump) {
-	splay_node_t *node;
-	connection_t *c;
-
-	for(node = connection_tree->head; node; node = node->next) {
-		c = node->data;
+	for list_each(connection_t, c, &connection_list) {
 		send_request(cdump, "%d %d %s %s %x %d %x",
-				CONTROL, REQ_DUMP_CONNECTIONS,
-				c->name, c->hostname, c->options, c->socket,
-				bitfield_to_int(&c->status, sizeof c->status));
+		             CONTROL, REQ_DUMP_CONNECTIONS,
+		             c->name, c->hostname, c->options, c->socket,
+		             bitfield_to_int(&c->status, sizeof(c->status)));
 	}
 
 	return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);