X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconnection.c;h=cbe7a9d610277e0f9c1ef57910ced33f7b9a956c;hb=efbdf1564bb6a8f17ca28e61ccc6a507f1159994;hp=ce4c7536e3c2e76c545052d8d1fd22720081769f;hpb=108b238915c5f58b3d94ab433dc5d04e064c2b11;p=meshlink

diff --git a/src/connection.c b/src/connection.c
index ce4c7536..cbe7a9d6 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,8 +1,6 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans
-                  2008      Max Rijevski <maksuf@gmail.com>
+    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
@@ -21,99 +19,67 @@
 
 #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;
-
-static int connection_compare(const connection_t *a, const connection_t *b) {
-	return a < b ? -1 : a == b ? 0 : 1;
+void init_connections(meshlink_handle_t *mesh) {
+	mesh->connections = list_alloc((list_action_t) free_connection);
+	mesh->everyone = new_connection();
+	mesh->everyone->name = xstrdup("mesh->everyone");
+	mesh->everyone->hostname = xstrdup("BROADCAST");
 }
 
-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");
-}
+void exit_connections(meshlink_handle_t *mesh) {
+	if(mesh->connections)
+		list_delete_list(mesh->connections);
+
+	free_connection(mesh->everyone);
 
-void exit_connections(void) {
-	splay_delete_tree(connection_tree);
-	free_connection(broadcast);
+	mesh->connections = NULL;
+	mesh->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)
 		return;
 
-	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);
+
+	free(c->name);
+	free(c->hostname);
 
 	if(c->config_tree)
 		exit_configuration(&c->config_tree);
 
-	if(c->buffer)
-		bufferevent_free(c->buffer);
-	
-	if(event_initialized(&c->inevent))
-		event_del(&c->inevent);
-
 	free(c);
 }
 
-void connection_add(connection_t *c) {
-	splay_insert(connection_tree, c);
-}
-
-void connection_del(connection_t *c) {
-	splay_delete(connection_tree, c);
+void connection_add(meshlink_handle_t *mesh, connection_t *c) {
+	c->mesh = mesh;
+	list_insert_tail(mesh->connections, c);
 }
 
-int dump_connections(struct evbuffer *out) {
-	splay_node_t *node;
-	connection_t *c;
-
-	for(node = connection_tree->head; node; node = node->next) {
-		c = node->data;
-		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;
-	}
-
-	return 0;
-}
-
-bool read_connection_config(connection_t *c) {
-	char *fname;
-	int x;
-
-	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	x = read_config_file(c->config_tree, fname);
-	free(fname);
-
-	return x == 0;
+void connection_del(meshlink_handle_t *mesh, connection_t *c) {
+	io_del(&mesh->loop, &c->io);
+	list_delete(mesh->connections, c);
 }