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

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index e6f44c0ce69a513f88c5736342dc33da2e83671d..6f4bff4fcf227b547aa1e48f66b31a96f3f7bbba 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -43,7 +43,6 @@ const char *meshlink_strerror(meshlink_errno_t errno) {
 // TODO: hack, remove once all global variables are gone.
 static void set_mesh(meshlink_handle_t *localmesh) {
        mesh = localmesh;
-       loop = &mesh->loop;
 }
 
 static bool ecdsa_keygen(meshlink_handle_t *mesh) {
@@ -238,7 +237,7 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
 
        init_configuration(&mesh->config);
 
-       if(!read_server_config())
+       if(!read_server_config(mesh))
                return meshlink_close(mesh), NULL;
 
        // Setup up everything