X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fconnection.c;h=9cc64914cd4ba217a85d824f9ff378e5f41884b1;hp=a369cb83d900827a5741c77343de39bc64c5dafe;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=1b8f8918360b40a2749d40355266ed7dedbe41b5

diff --git a/src/connection.c b/src/connection.c
index a369cb83..9cc64914 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,6 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2007 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans
+    Copyright (C) 2000-2013 Guus Sliepen <guus@meshlink.io>
 
     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,120 +12,80 @@
     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 "list.h"
 #include "conf.h"
+#include "connection.h"
 #include "list.h"
 #include "logger.h"
-#include "net.h"				/* Don't ask. */
-#include "netutl.h"
-#include "subnet.h"
+#include "meshlink_internal.h"
 #include "utils.h"
 #include "xalloc.h"
 
-splay_tree_t *connection_tree;	/* Meta connections */
-connection_t *broadcast;
+void init_connections(meshlink_handle_t *mesh) {
+	assert(!mesh->connections);
+	assert(!mesh->everyone);
 
-static int connection_compare(const connection_t *a, const connection_t *b) {
-	return (void *)a - (void *)b;
+	mesh->connections = list_alloc((list_action_t) free_connection);
+	mesh->everyone = new_connection();
+	mesh->everyone->name = xstrdup("mesh->everyone");
 }
 
-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"));
-}
+void exit_connections(meshlink_handle_t *mesh) {
+	if(mesh->connections) {
+		list_delete_list(mesh->connections);
+	}
 
-void exit_connections(void) {
-	cp();
+	if(mesh->everyone) {
+		free_connection(mesh->everyone);
+	}
 
-	splay_delete_tree(connection_tree);
-	free_connection(broadcast);
+	mesh->connections = NULL;
+	mesh->everyone = NULL;
 }
 
 connection_t *new_connection(void) {
-	cp();
-
-	return xmalloc_and_zero(sizeof(connection_t));
+	return xzalloc(sizeof(connection_t));
 }
 
 void free_connection(connection_t *c) {
-	cp();
-
-	if(!c)
-		return;
+	assert(c);
 
-	if(c->name)
-		free(c->name);
+	sptps_stop(&c->sptps);
+	ecdsa_free(c->ecdsa);
 
-	if(c->hostname)
-		free(c->hostname);
+	buffer_clear(&c->inbuf);
+	buffer_clear(&c->outbuf);
 
-	cipher_close(&c->incipher);
-	cipher_close(&c->outcipher);
+	if(c->io.cb) {
+		abort();
+	}
 
-	if(c->hischallenge)
-		free(c->hischallenge);
+	if(c->socket > 0) {
+		closesocket(c->socket);
+	}
 
-	if(c->buffer)
-		bufferevent_free(c->buffer);
-	
-	if(event_initialized(&c->inevent))
-		event_del(&c->inevent);
+	free(c->name);
 
 	free(c);
 }
 
-void connection_add(connection_t *c) {
-	cp();
-
-	splay_insert(connection_tree, c);
-}
-
-void connection_del(connection_t *c) {
-	cp();
+void connection_add(meshlink_handle_t *mesh, connection_t *c) {
+	assert(c);
 
-	splay_delete(connection_tree, c);
+	c->mesh = mesh;
+	list_insert_tail(mesh->connections, c);
 }
 
-void dump_connections(void) {
-	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"),
-			   c->name, c->hostname, c->options, c->socket, c->status.value);
-	}
-
-	logger(LOG_DEBUG, _("End of connections."));
-}
-
-bool read_connection_config(connection_t *c) {
-	char *fname;
-	int x;
-
-	cp();
-
-	asprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	x = read_config_file(c->config_tree, fname);
-	free(fname);
+void connection_del(meshlink_handle_t *mesh, connection_t *c) {
+	assert(c);
 
-	return x == 0;
+	io_del(&mesh->loop, &c->io);
+	list_delete(mesh->connections, c);
 }