Stop using global variable mesh in net_socket.[ch].

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index b566498551940ba8299d68b31599d736b0b8c717..124b6e8f649731495a3fb65e9c7b0407e789f315 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -213,6 +213,7 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
        mesh->confbase = xstrdup(confbase);
        mesh->name = xstrdup(name);
        event_loop_init(&mesh->loop);
+       mesh->loop.data = mesh;
        set_mesh(mesh);
 
        // TODO: should be set by a function.
@@ -252,7 +253,7 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
 void *meshlink_main_loop(void *arg) {
        meshlink_handle_t *mesh = arg;
 
-       try_outgoing_connections();
+       try_outgoing_connections(mesh);
 
        main_loop();