Move listen_sockets to mesh.

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 02e1a84de4a8f96834401c7d0c2591828396189e..c38bc4a071ca7cb205a5d85a5e7a9b91a4957191 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -25,22 +25,21 @@
 #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);
+       mesh->connections = list_alloc((list_action_t) free_connection);
        everyone = new_connection();
        everyone->name = xstrdup("everyone");
        everyone->hostname = xstrdup("BROADCAST");
 }
 
 void exit_connections(void) {
-       list_delete_list(connection_list);
+       list_delete_list(mesh->connections);
        free_connection(everyone);
 }
 
@@ -52,16 +51,8 @@ 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);
@@ -81,9 +72,9 @@ void free_connection(connection_t *c) {
 }
 
 void connection_add(connection_t *c) {
-       list_insert_tail(connection_list, c);
+       list_insert_tail(mesh->connections, c);
 }
 
 void connection_del(connection_t *c) {
-       list_delete(connection_list, c);
+       list_delete(mesh->connections, c);
 }