From: Guus Sliepen Date: Sun, 11 May 2014 20:31:29 +0000 (+0200) Subject: No need to create confbase in meshlink_join(). X-Git-Url: http://git.meshlink.io/?a=commitdiff_plain;ds=sidebyside;h=b6ceafe7a5db5802e483795738943f01f1732926;p=meshlink No need to create confbase in meshlink_join(). --- diff --git a/src/meshlink.c b/src/meshlink.c index ca5fa3bb..5a171d2b 100644 --- a/src/meshlink.c +++ b/src/meshlink.c @@ -1120,23 +1120,7 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { char copy[strlen(invitation) + 1]; strcpy(copy, invitation); - // Make sure confbase exists and is accessible. - if(mkdir(mesh->confbase, 0777) && errno != EEXIST) { - fprintf(stderr, "Could not create directory %s: %s\n", mesh->confbase, strerror(errno)); - return false; - } - - if(access(mesh->confbase, R_OK | W_OK | X_OK)) { - fprintf(stderr, "No permission to write in directory %s: %s\n", mesh->confbase, strerror(errno)); - return false; - } - - // TODO: Either remove or reintroduce netname in meshlink - // If a netname or explicit configuration directory is specified, check for an existing meshlink.conf. - //if((mesh->netname || confbasegiven) && !access(meshlink_conf, F_OK)) { - // fprintf(stderr, "Configuration file %s already exists!\n", meshlink_conf); - // return 1; - //} + // Split the invitation URL into hostname, port, key hash and cookie. char *slash = strchr(copy, '/'); if(!slash)