Fix a memory leak.

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index 27ba877a25f2358fcc9a3a2efd1e14b37160831e..f173c8d24e00fa575d562cdcbef1e05026f4eb11 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -44,6 +44,8 @@ typedef struct {
 #define MSG_NOSIGNAL 0
 #endif
 
+__thread meshlink_errno_t meshlink_errno;
+
 //TODO: this can go away completely
 const var_t variables[] = {
        /* Server configuration */
@@ -192,7 +194,7 @@ static char *get_my_hostname(meshlink_handle_t* mesh) {
        fprintf(stderr, "Trying to discover externally visible hostname...\n");
        struct addrinfo *ai = str2addrinfo("meshlink.io", "80", SOCK_STREAM);
        struct addrinfo *aip = ai;
-       static const char request[] = "GET http://meshlink.io/host.cgi HTTP/1.0\r\n\r\n";
+       static const char request[] = "GET http://www.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);
@@ -327,15 +329,20 @@ static bool try_bind(int port) {
 
        while(ai) {
                int fd = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
-               if(!fd)
+               if(!fd) {
+                       freeaddrinfo(ai);
                        return false;
+               }
                int result = bind(fd, ai->ai_addr, ai->ai_addrlen);
                closesocket(fd);
-               if(result)
+               if(result) {
+                       freeaddrinfo(ai);
                        return false;
+               }
                ai = ai->ai_next;
        }
 
+       freeaddrinfo(ai);
        return true;
 }
 
@@ -508,7 +515,7 @@ static bool finalize_join(meshlink_handle_t *mesh) {
        free(mesh->self->name);
        free(mesh->self->connection->name);
        mesh->self->name = xstrdup(name);
-       mesh->self->connection->name = xstrdup(name);
+       mesh->self->connection->name = name;
 
        fprintf(stderr, "Configuration stored in: %s\n", mesh->confbase);
 
@@ -782,7 +789,7 @@ meshlink_handle_t *meshlink_open(const char *confbase, const char *name) {
        return mesh;
 }
 
-void *meshlink_main_loop(void *arg) {
+static void *meshlink_main_loop(void *arg) {
        meshlink_handle_t *mesh = arg;
 
        try_outgoing_connections(mesh);
@@ -1100,6 +1107,8 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) {
 
        b64encode_urlsafe(cookie, cookie, 18);
 
+       free(fingerprint);
+
        // Create a file containing the details of the invitation.
        snprintf(filename, sizeof filename, "%s" SLASH "invitations" SLASH "%s", mesh->confbase, cookiehash);
        int ifd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
@@ -1147,11 +1156,15 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) {
        // Create an URL from the local address, key hash and cookie
        char *url;
        xasprintf(&url, "%s/%s%s", address, hash, cookie);
+       free(address);
 
        return url;
 }
 
 bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
+       if(!mesh || !invitation)
+               return false;
+
        //TODO: think of a better name for this variable, or of a different way to tokenize the invitation URL.
        char copy[strlen(invitation) + 1];
        strcpy(copy, invitation);
@@ -1230,6 +1243,8 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
                return false;
        }
 
+       free(b64key);
+
        char hisname[4096] = "";
        int code, hismajor, hisminor = 0;