Remove some more traces of tinc.

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index fc8408ad1309843d9641df75a47323f0411b192d..27ba877a25f2358fcc9a3a2efd1e14b37160831e 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -16,7 +16,7 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-#define VAR_SERVER 1    /* Should be in tinc.conf */
+#define VAR_SERVER 1    /* Should be in meshlink.conf */
 #define VAR_HOST 2      /* Can be in host config file */
 #define VAR_MULTIPLE 4  /* Multiple statements allowed */
 #define VAR_OBSOLETE 8  /* Should not be used anymore */
@@ -190,9 +190,9 @@ static char *get_my_hostname(meshlink_handle_t* mesh) {
 
        // If that doesn't work, guess externally visible hostname
        fprintf(stderr, "Trying to discover externally visible hostname...\n");
-       struct addrinfo *ai = str2addrinfo("tinc-vpn.org", "80", SOCK_STREAM);
+       struct addrinfo *ai = str2addrinfo("meshlink.io", "80", SOCK_STREAM);
        struct addrinfo *aip = ai;
-       static const char request[] = "GET http://tinc-vpn.org/host.cgi HTTP/1.0\r\n\r\n";
+       static const char request[] = "GET http://meshlink.io/host.cgi HTTP/1.0\r\n\r\n";
 
        while(aip) {
                int s = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol);
@@ -398,7 +398,7 @@ static bool finalize_join(meshlink_handle_t *mesh) {
                return false;
        }
 
-       // Filter first chunk on approved keywords, split between tinc.conf and hosts/Name
+       // Filter first chunk on approved keywords, split between meshlink.conf and hosts/Name
        // Other chunks go unfiltered to their respective host config files
        const char *p = mesh->data;
        char *l, *value;
@@ -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,19 +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;
 
@@ -791,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) {
@@ -799,6 +809,8 @@ bool meshlink_start(meshlink_handle_t *mesh) {
                return false;
        }
 
+       mesh->threadstarted=true;
+
        return true;
 }
 
@@ -825,6 +837,8 @@ void meshlink_close(meshlink_handle_t *mesh) {
        exit_configuration(&mesh->config);
        event_loop_exit(&mesh->loop);
 
+       free(mesh);
+
 #ifdef HAVE_MINGW
        WSACleanup();
 #endif
@@ -913,12 +927,23 @@ size_t meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes,
        return i;
 }
 
-char *meshlink_sign(meshlink_handle_t *mesh, const char *data, size_t len) {
-       return NULL;
+bool meshlink_sign(meshlink_handle_t *mesh, const void *data, size_t len, void *signature, size_t *siglen) {
+       if(*siglen < MESHLINK_SIGLEN)
+               return false;
+       if(!ecdsa_sign(mesh->self->connection->ecdsa, data, len, signature))
+               return false;
+       *siglen = MESHLINK_SIGLEN;
+       return true;
 }
 
-bool meshlink_verify(meshlink_handle_t *mesh, meshlink_node_t *source, const char *data, size_t len, const char *signature) {
-       return false;
+bool meshlink_verify(meshlink_handle_t *mesh, meshlink_node_t *source, const void *data, size_t len, const void *signature, size_t siglen) {
+       if(siglen != MESHLINK_SIGLEN)
+               return false;
+       struct node_t *n = (struct node_t *)source;
+       node_read_ecdsa_public_key(mesh, n);
+       if(!n->ecdsa)
+               return false;
+       return ecdsa_verify(((struct node_t *)source)->ecdsa, data, len, signature);
 }
 
 static bool refresh_invitation_key(meshlink_handle_t *mesh) {
@@ -1158,7 +1183,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))
@@ -1171,6 +1196,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)
@@ -1261,7 +1291,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;
 }