Put a value also in mesh->name in finalize join

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index 72e27b0fe99cf3e956d3d125f093bc020e6c558d..e6ea203fbe996748e7e309ccf5fe69f4767bc8e6 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -508,6 +508,7 @@ static bool finalize_join(meshlink_handle_t *mesh) {
        free(mesh->self->name);
        free(mesh->self->connection->name);
        mesh->self->name = xstrdup(name);
+       mesh->name = xstrdup(name);
        mesh->self->connection->name = xstrdup(name);
 
        fprintf(stderr, "Configuration stored in: %s\n", mesh->confbase);
@@ -715,6 +716,7 @@ static bool meshlink_setup(meshlink_handle_t *mesh) {
 
 meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
        // Validate arguments provided by the application
+       bool usingname = false;
 
        if(!confbase || !*confbase) {
                fprintf(stderr, "No confbase given!\n");
@@ -723,18 +725,27 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
 
        if(!name || !*name) {
                fprintf(stderr, "No name given!\n");
-               return NULL;
+               //return NULL;
        }
+       else { //check name only if there is a name != NULL
 
-       if(!check_id(name)) {
-               fprintf(stderr, "Invalid name given!\n");
-               return NULL;
+               if(!check_id(name)) {
+                       fprintf(stderr, "Invalid name given!\n");
+                       return NULL;
+               } else { usingname = true;}
        }
 
        meshlink_handle_t *mesh = xzalloc(sizeof *mesh);
        mesh->confbase = xstrdup(confbase);
-       mesh->name = xstrdup(name);
+       if (usingname) mesh->name = xstrdup(name);
+       mesh->self = new_node();
+       mesh->self->connection = new_connection();
+       if(!read_ecdsa_private_key(mesh))
+               return false;
+       init_nodes(mesh);
        pthread_mutex_init ( &(mesh->outpacketqueue_mutex), NULL);
+       pthread_mutex_init ( &(mesh->nodes_mutex), NULL);
+       mesh->threadstarted = false;
        event_loop_init(&mesh->loop);
        mesh->loop.data = mesh;
 
@@ -768,11 +779,6 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
        WSAStartup(MAKEWORD(2, 2), &wsa_state);
 #endif
 
-       // Setup up everything
-       // TODO: we should not open listening sockets yet
-
-       if(!setup_network(mesh))
-               return meshlink_close(mesh), NULL;
 
        return mesh;
 }
@@ -790,6 +796,16 @@ void *meshlink_main_loop(void *arg) {
 bool meshlink_start(meshlink_handle_t *mesh) {
        // TODO: open listening sockets first
 
+       //Check that a valid name is set
+       if(!mesh->name ) {
+               fprintf(stderr, "No name given!\n");
+               return false;
+       }
+       // Setup up everything
+
+       if(!setup_network(mesh))
+               return meshlink_close(mesh), NULL;
+
        // Start the main thread
 
        if(pthread_create(&mesh->thread, NULL, meshlink_main_loop, mesh) != 0) {
@@ -798,6 +814,8 @@ bool meshlink_start(meshlink_handle_t *mesh) {
                return false;
        }
 
+       mesh->threadstarted=true;
+
        return true;
 }
 
@@ -824,6 +842,8 @@ void meshlink_close(meshlink_handle_t *mesh) {
        exit_configuration(&mesh->config);
        event_loop_exit(&mesh->loop);
 
+       free(mesh);
+
 #ifdef HAVE_MINGW
        WSACleanup();
 #endif
@@ -898,12 +918,17 @@ meshlink_node_t *meshlink_get_node(meshlink_handle_t *mesh, const char *name) {
 size_t meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes, size_t nmemb) {
        size_t i = 0;
 
+       //lock mesh->nodes
+       pthread_mutex_lock(&(mesh->nodes_mutex));
+
        for splay_each(node_t, n, mesh->nodes) {
                if(i < nmemb)
                        nodes[i] = (meshlink_node_t *)n;
                i++;
        }
 
+       pthread_mutex_unlock(&(mesh->nodes_mutex));
+
        return i;
 }
 
@@ -1152,7 +1177,7 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
                        *port++ = 0;
        }
 
-       if(!*port)
+       if(!port)
                port = "655";
 
        if(!b64decode(slash, mesh->hash, 18) || !b64decode(slash + 24, mesh->cookie, 18))
@@ -1165,6 +1190,11 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
 
        char *b64key = ecdsa_get_base64_public_key(key);
 
+       //Before doing meshlink_join make sure we are not connected to another mesh
+       if ( mesh->threadstarted ){
+               goto invalid;
+       }
+
        // Connect to the meshlink daemon mentioned in the URL.
        struct addrinfo *ai = str2addrinfo(address, port, SOCK_STREAM);
        if(!ai)
@@ -1255,7 +1285,7 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
        return true;
 
 invalid:
-       fprintf(stderr, "Invalid invitation URL.\n");
+       fprintf(stderr, "Invalid invitation URL or you are already connected to a Mesh ?\n");
        return false;
 }