Stop using the global variable mesh in most of the rest of the code.

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 02e1a84de4a8f96834401c7d0c2591828396189e..05a9d653dc3bf377128b5eb73bd4017dfba2c2c5 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -20,28 +20,24 @@
 #include "system.h"
 
 #include "list.h"
-#include "cipher.h"
 #include "conf.h"
 #include "connection.h"
 #include "list.h"
 #include "logger.h"
-#include "rsa.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) {
+       list_delete_list(mesh->connections);
+       free_connection(mesh->everyone);
 }
 
 connection_t *new_connection(void) {
@@ -52,21 +48,14 @@ void free_connection(connection_t *c) {
        if(!c)
                return;
 
-       cipher_close(c->incipher);
-       digest_close(c->indigest);
-       cipher_close(c->outcipher);
-       digest_close(c->outdigest);
-
        sptps_stop(&c->sptps);
        ecdsa_free(c->ecdsa);
-       rsa_free(c->rsa);
-
-       free(c->hischallenge);
 
        buffer_clear(&c->inbuf);
        buffer_clear(&c->outbuf);
 
-       io_del(&c->io);
+       if(c->io.cb)
+               abort();
 
        if(c->socket > 0)
                closesocket(c->socket);
@@ -80,10 +69,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);
 }