Fix a crash when meshlink_open() is called with an invalid confbase.

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index c38bc4a071ca7cb205a5d85a5e7a9b91a4957191..cbe7a9d610277e0f9c1ef57910ced33f7b9a956c 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -20,7 +20,6 @@
 #include "system.h"
 
 #include "list.h"
-#include "cipher.h"
 #include "conf.h"
 #include "connection.h"
 #include "list.h"
@@ -29,18 +28,21 @@
 #include "utils.h"
 #include "xalloc.h"
 
-connection_t *everyone;
-
-void init_connections(void) {
+void init_connections(meshlink_handle_t *mesh) {
        mesh->connections = list_alloc((list_action_t) free_connection);
-       everyone = new_connection();
-       everyone->name = xstrdup("everyone");
-       everyone->hostname = xstrdup("BROADCAST");
+       mesh->everyone = new_connection();
+       mesh->everyone->name = xstrdup("mesh->everyone");
+       mesh->everyone->hostname = xstrdup("BROADCAST");
 }
 
-void exit_connections(void) {
-       list_delete_list(mesh->connections);
-       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) {
+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) {
+void connection_del(meshlink_handle_t *mesh, connection_t *c) {
+       io_del(&mesh->loop, &c->io);
        list_delete(mesh->connections, c);
 }