Allow meshlink_open() to be called with a NULL name, in anticipation of meshlink_join...

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index 72e27b0fe99cf3e956d3d125f093bc020e6c558d..7ea3e440b0f941d773c06eba53a267b0199b7508 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -715,6 +715,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 +724,22 @@ 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);
        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;
 
@@ -790,6 +795,12 @@ 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;
+       }
+
        // Start the main thread
 
        if(pthread_create(&mesh->thread, NULL, meshlink_main_loop, mesh) != 0) {
@@ -798,6 +809,8 @@ bool meshlink_start(meshlink_handle_t *mesh) {
                return false;
        }
 
+       mesh->threadstarted=true;
+
        return true;
 }
 
@@ -898,12 +911,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 +1170,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 +1183,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 +1278,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;
 }