X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconnection.c;h=cbe7a9d610277e0f9c1ef57910ced33f7b9a956c;hb=ea17ede077e84f88c7f20e9053b38086583ab635;hp=d25159e6438c2102b4d7747377ed0e3eba7dac01;hpb=2956559f7d12caa9779207525419801e0e9ab3e3;p=meshlink

diff --git a/src/connection.c b/src/connection.c
index d25159e6..cbe7a9d6 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -20,27 +20,29 @@
 #include "system.h"
 
 #include "list.h"
-#include "cipher.h"
 #include "conf.h"
 #include "connection.h"
 #include "list.h"
 #include "logger.h"
+#include "meshlink_internal.h"
 #include "utils.h"
 #include "xalloc.h"
 
-list_t *connection_list;
-connection_t *everyone;
-
-void init_connections(void) {
-	connection_list = list_alloc((list_action_t) free_connection);
-	everyone = new_connection();
-	everyone->name = xstrdup("everyone");
-	everyone->hostname = xstrdup("BROADCAST");
+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 exit_connections(void) {
-	list_delete_list(connection_list);
-	free_connection(everyone);
+void exit_connections(meshlink_handle_t *mesh) {
+	if(mesh->connections)
+		list_delete_list(mesh->connections);
+
+	free_connection(mesh->everyone);
+
+	mesh->connections = NULL;
+	mesh->everyone = NULL;
 }
 
 connection_t *new_connection(void) {
@@ -57,7 +59,8 @@ void free_connection(connection_t *c) {
 	buffer_clear(&c->inbuf);
 	buffer_clear(&c->outbuf);
 
-	io_del(&c->io);
+	if(c->io.cb)
+		abort();
 
 	if(c->socket > 0)
 		closesocket(c->socket);
@@ -71,10 +74,12 @@ void free_connection(connection_t *c) {
 	free(c);
 }
 
-void connection_add(connection_t *c) {
-	list_insert_tail(connection_list, c);
+void connection_add(meshlink_handle_t *mesh, connection_t *c) {
+	c->mesh = mesh;
+	list_insert_tail(mesh->connections, c);
 }
 
-void connection_del(connection_t *c) {
-	list_delete(connection_list, c);
+void connection_del(meshlink_handle_t *mesh, connection_t *c) {
+	io_del(&mesh->loop, &c->io);
+	list_delete(mesh->connections, c);
 }