]> git.meshlink.io Git - meshlink/blobdiff - src/meshlink.c
Lock meshlink.conf to ensure only one instance can run at a time.
[meshlink] / src / meshlink.c
index bf1eb92bcdf0719ac99eb1780b4e5bbc4d173854..6df7c419261fc30f175ef016d00538c295d77f29 100644 (file)
@@ -1,6 +1,6 @@
 /*
     meshlink.c -- Implementation of the MeshLink API.
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014-2018 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -39,6 +39,7 @@ typedef struct {
 #include "node.h"
 #include "protocol.h"
 #include "route.h"
+#include "sockaddr.h"
 #include "utils.h"
 #include "xalloc.h"
 #include "ed25519/sha512.h"
@@ -48,8 +49,6 @@ typedef struct {
 #define MSG_NOSIGNAL 0
 #endif
 
-static pthread_mutex_t global_mutex;
-
 __thread meshlink_errno_t meshlink_errno;
 meshlink_log_cb_t global_log_cb;
 meshlink_log_level_t global_log_level;
@@ -57,69 +56,19 @@ meshlink_log_level_t global_log_level;
 //TODO: this can go away completely
 const var_t variables[] = {
        /* Server configuration */
-       {"AddressFamily", VAR_SERVER},
-       {"AutoConnect", VAR_SERVER | VAR_SAFE},
-       {"BindToAddress", VAR_SERVER | VAR_MULTIPLE},
-       {"BindToInterface", VAR_SERVER},
-       {"Broadcast", VAR_SERVER | VAR_SAFE},
        {"ConnectTo", VAR_SERVER | VAR_MULTIPLE | VAR_SAFE},
-       {"DecrementTTL", VAR_SERVER},
-       {"Device", VAR_SERVER},
-       {"DeviceType", VAR_SERVER},
-       {"DirectOnly", VAR_SERVER},
-       {"ECDSAPrivateKeyFile", VAR_SERVER},
-       {"ExperimentalProtocol", VAR_SERVER},
-       {"Forwarding", VAR_SERVER},
-       {"GraphDumpFile", VAR_SERVER | VAR_OBSOLETE},
-       {"Hostnames", VAR_SERVER},
-       {"IffOneQueue", VAR_SERVER},
-       {"Interface", VAR_SERVER},
-       {"KeyExpire", VAR_SERVER},
-       {"ListenAddress", VAR_SERVER | VAR_MULTIPLE},
-       {"LocalDiscovery", VAR_SERVER},
-       {"MACExpire", VAR_SERVER},
-       {"MaxConnectionBurst", VAR_SERVER},
-       {"MaxOutputBufferSize", VAR_SERVER},
-       {"MaxTimeout", VAR_SERVER},
-       {"Mode", VAR_SERVER | VAR_SAFE},
        {"Name", VAR_SERVER},
-       {"PingInterval", VAR_SERVER},
-       {"PingTimeout", VAR_SERVER},
-       {"PriorityInheritance", VAR_SERVER},
-       {"PrivateKey", VAR_SERVER | VAR_OBSOLETE},
-       {"PrivateKeyFile", VAR_SERVER},
-       {"ProcessPriority", VAR_SERVER},
-       {"Proxy", VAR_SERVER},
-       {"ReplayWindow", VAR_SERVER},
-       {"ScriptsExtension", VAR_SERVER},
-       {"ScriptsInterpreter", VAR_SERVER},
-       {"StrictSubnets", VAR_SERVER},
-       {"TunnelServer", VAR_SERVER},
-       {"VDEGroup", VAR_SERVER},
-       {"VDEPort", VAR_SERVER},
        /* Host configuration */
+       {"CanonicalAddress", VAR_HOST},
        {"Address", VAR_HOST | VAR_MULTIPLE},
-       {"Cipher", VAR_SERVER | VAR_HOST},
-       {"ClampMSS", VAR_SERVER | VAR_HOST},
-       {"Compression", VAR_SERVER | VAR_HOST},
-       {"Digest", VAR_SERVER | VAR_HOST},
        {"ECDSAPublicKey", VAR_HOST},
-       {"ECDSAPublicKeyFile", VAR_SERVER | VAR_HOST},
-       {"IndirectData", VAR_SERVER | VAR_HOST},
-       {"MACLength", VAR_SERVER | VAR_HOST},
-       {"PMTU", VAR_SERVER | VAR_HOST},
-       {"PMTUDiscovery", VAR_SERVER | VAR_HOST},
        {"Port", VAR_HOST},
-       {"PublicKey", VAR_HOST | VAR_OBSOLETE},
-       {"PublicKeyFile", VAR_SERVER | VAR_HOST | VAR_OBSOLETE},
-       {"Subnet", VAR_HOST | VAR_MULTIPLE | VAR_SAFE},
-       {"TCPOnly", VAR_SERVER | VAR_HOST},
-       {"Weight", VAR_HOST | VAR_SAFE},
        {NULL, 0}
 };
 
 static bool fcopy(FILE *out, const char *filename) {
        FILE *in = fopen(filename, "r");
+
        if(!in) {
                logger(NULL, MESHLINK_ERROR, "Could not open %s: %s\n", filename, strerror(errno));
                return false;
@@ -127,196 +76,395 @@ static bool fcopy(FILE *out, const char *filename) {
 
        char buf[1024];
        size_t len;
-       while((len = fread(buf, 1, sizeof buf, in)))
+
+       while((len = fread(buf, 1, sizeof(buf), in))) {
                fwrite(buf, len, 1, out);
+       }
+
        fclose(in);
        return true;
 }
 
 static int rstrip(char *value) {
        int len = strlen(value);
-       while(len && strchr("\t\r\n ", value[len - 1]))
+
+       while(len && strchr("\t\r\n ", value[len - 1])) {
                value[--len] = 0;
+       }
+
        return len;
 }
 
 static void scan_for_hostname(const char *filename, char **hostname, char **port) {
        char line[4096];
-       if(!filename || (*hostname && *port))
+       bool canonical = false;
+
+       if(!filename || (*hostname && *port)) {
                return;
+       }
 
        FILE *f = fopen(filename, "r");
-       if(!f)
+
+       if(!f) {
                return;
+       }
 
-       while(fgets(line, sizeof line, f)) {
-               if(!rstrip(line))
+       while(fgets(line, sizeof(line), f)) {
+               if(!rstrip(line)) {
                        continue;
+               }
+
                char *p = line, *q;
                p += strcspn(p, "\t =");
-               if(!*p)
+
+               if(!*p) {
                        continue;
+               }
+
                q = p + strspn(p, "\t ");
-               if(*q == '=')
+
+               if(*q == '=') {
                        q += 1 + strspn(q + 1, "\t ");
+               }
+
+               // q is now pointing to the hostname
                *p = 0;
                p = q + strcspn(q, "\t ");
-               if(*p)
+
+               if(*p) {
                        *p++ = 0;
+               }
+
                p += strspn(p, "\t ");
                p[strcspn(p, "\t ")] = 0;
+               // p is now pointing to the port, if present
 
                if(!*port && !strcasecmp(line, "Port")) {
                        *port = xstrdup(q);
-               } else if(!*hostname && !strcasecmp(line, "Address")) {
+               } else if(!canonical && !*hostname && !strcasecmp(line, "Address")) {
+                       // Check that the hostname is a symbolic name (it's not a numeric IPv4 or IPv6 address)
+                       if(!q[strspn(q, "0123456789.")] || strchr(q, ':')) {
+                               continue;
+                       }
+
+                       *hostname = xstrdup(q);
+
+                       if(*p) {
+                               free(*port);
+                               *port = xstrdup(p);
+                       }
+               } else if(!strcasecmp(line, "CanonicalAddress")) {
                        *hostname = xstrdup(q);
+                       canonical = true;
+
                        if(*p) {
                                free(*port);
                                *port = xstrdup(p);
                        }
                }
 
-               if(*hostname && *port)
+               if(canonical && *hostname && *port) {
                        break;
+               }
        }
 
        fclose(f);
 }
-static char *get_my_hostname(meshlink_handle_t* mesh) {
-       char *hostname = NULL;
-       char *port = NULL;
-       char *hostport = NULL;
-       char *name = mesh->self->name;
-       char filename[PATH_MAX] = "";
-       char line[4096];
-       FILE *f;
 
-       // Use first Address statement in own host config file
-       snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
-       scan_for_hostname(filename, &hostname, &port);
+static bool is_valid_hostname(const char *hostname) {
+       if(!*hostname) {
+               return false;
+       }
 
-       if(hostname)
-               goto done;
+       for(const char *p = hostname; *p; p++) {
+               if(!(isalnum(*p) || *p == '-' || *p == '.' || *p == ':')) {
+                       return false;
+               }
+       }
+
+       return true;
+}
+
+static bool is_valid_port(const char *port) {
+       if(!*port) {
+               return false;
+       }
+
+       if(isdigit(*port)) {
+               char *end;
+               unsigned long int result = strtoul(port, &end, 10);
+               return result && result < 65536 && !*end;
+       }
+
+       for(const char *p = port; *p; p++) {
+               if(!(isalnum(*p) || *p == '-')) {
+                       return false;
+               }
+       }
+
+       return true;
+}
+
+static void set_timeout(int sock, int timeout) {
+#ifdef _WIN32
+       DWORD tv = timeout;
+#else
+       struct timeval tv;
+       tv.tv_sec = timeout / 1000;
+       tv.tv_usec = (timeout - tv.tv_sec * 1000) * 1000;
+#endif
+       setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+       setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
+}
+
+// Find out what local address a socket would use if we connect to the given address.
+// We do this using connect() on a UDP socket, so the kernel has to resolve the address
+// of both endpoints, but this will actually not send any UDP packet.
+static bool getlocaladdrname(char *destaddr, char *host, socklen_t hostlen) {
+       struct addrinfo *rai = NULL;
+       const struct addrinfo hint = {
+               .ai_family = AF_UNSPEC,
+               .ai_socktype = SOCK_DGRAM,
+               .ai_protocol = IPPROTO_UDP,
+       };
+
+       if(getaddrinfo(destaddr, "80", &hint, &rai) || !rai) {
+               return false;
+       }
+
+       int sock = socket(rai->ai_family, rai->ai_socktype, rai->ai_protocol);
+
+       if(sock == -1) {
+               freeaddrinfo(rai);
+               return false;
+       }
+
+       if(connect(sock, rai->ai_addr, rai->ai_addrlen) && !sockwouldblock(errno)) {
+               freeaddrinfo(rai);
+               return false;
+       }
+
+       freeaddrinfo(rai);
+
+       struct sockaddr_storage sn;
+       socklen_t sl = sizeof(sn);
+
+       if(getsockname(sock, (struct sockaddr *)&sn, &sl)) {
+               return false;
+       }
+
+       if(getnameinfo((struct sockaddr *)&sn, sl, host, hostlen, NULL, 0, NI_NUMERICHOST | NI_NUMERICSERV)) {
+               return false;
+       }
+
+       return true;
+}
+
+char *meshlink_get_external_address(meshlink_handle_t *mesh) {
+       return meshlink_get_external_address_for_family(mesh, AF_UNSPEC);
+}
+
+char *meshlink_get_external_address_for_family(meshlink_handle_t *mesh, int family) {
+       char *hostname = NULL;
 
-       // If that doesn't work, guess externally visible hostname
        logger(mesh, MESHLINK_DEBUG, "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://www.meshlink.io/host.cgi HTTP/1.0\r\n\r\n";
+       char line[256];
+
+       for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
+               if(family != AF_UNSPEC && aip->ai_family != family) {
+                       continue;
+               }
 
-       while(aip) {
                int s = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol);
+
                if(s >= 0) {
+                       set_timeout(s, 5000);
+
                        if(connect(s, aip->ai_addr, aip->ai_addrlen)) {
                                closesocket(s);
                                s = -1;
                        }
                }
+
                if(s >= 0) {
-                       send(s, request, sizeof request - 1, 0);
-                       int len = recv(s, line, sizeof line - 1, MSG_WAITALL);
+                       send(s, request, sizeof(request) - 1, 0);
+                       int len = recv(s, line, sizeof(line) - 1, MSG_WAITALL);
+
                        if(len > 0) {
                                line[len] = 0;
-                               if(line[len - 1] == '\n')
+
+                               if(line[len - 1] == '\n') {
                                        line[--len] = 0;
+                               }
+
                                char *p = strrchr(line, '\n');
-                               if(p && p[1])
+
+                               if(p && p[1]) {
                                        hostname = xstrdup(p + 1);
+                               }
                        }
+
                        closesocket(s);
-                       if(hostname)
+
+                       if(hostname) {
                                break;
+                       }
                }
-               aip = aip->ai_next;
-               continue;
        }
 
-       if(ai)
+       if(ai) {
                freeaddrinfo(ai);
+       }
 
        // Check that the hostname is reasonable
-       if(hostname) {
-               for(char *p = hostname; *p; p++) {
-                       if(isalnum(*p) || *p == '-' || *p == '.' || *p == ':')
-                               continue;
-                       // If not, forget it.
-                       free(hostname);
-                       hostname = NULL;
-                       break;
-               }
+       if(hostname && !is_valid_hostname(hostname)) {
+               free(hostname);
+               hostname = NULL;
        }
 
-       if(!hostname)
-               return NULL;
+       // If there is no hostname, determine the address used for an outgoing connection.
+       if(!hostname) {
+               char localaddr[NI_MAXHOST];
+               bool success = false;
 
-       f = fopen(filename, "a");
-       if(f) {
-               fprintf(f, "\nAddress = %s\n", hostname);
-               fclose(f);
-       } else {
-               logger(mesh, MESHLINK_DEBUG, "Could not append Address to %s: %s\n", filename, strerror(errno));
+               if(family == AF_INET) {
+                       success = getlocaladdrname("93.184.216.34", localaddr, sizeof(localaddr));
+               } else if(family == AF_INET6) {
+                       success = getlocaladdrname("2606:2800:220:1:248:1893:25c8:1946", localaddr, sizeof(localaddr));
+               }
+
+               if(success) {
+                       hostname = xstrdup(localaddr);
+               }
        }
 
-done:
-       if(port) {
-               if(strchr(hostname, ':'))
-                       xasprintf(&hostport, "[%s]:%s", hostname, port);
-               else
-                       xasprintf(&hostport, "%s:%s", hostname, port);
-       } else {
-               if(strchr(hostname, ':'))
-                       xasprintf(&hostport, "[%s]", hostname);
-               else
-                       hostport = xstrdup(hostname);
+       if(!hostname) {
+               meshlink_errno = MESHLINK_ERESOLV;
+       }
+
+       return hostname;
+}
+
+// String comparison which handles NULL arguments
+static bool safe_streq(const char *a, const char *b) {
+       if (!a || !b)
+               return a == b;
+       else
+               return !strcmp(a, b);
+}
+
+// This gets the hostname part for use in invitation URLs
+static char *get_my_hostname(meshlink_handle_t *mesh) {
+       char *hostname[3] = {NULL};
+       char *port[3] = {NULL};
+       char *hostport = NULL;
+
+       // Use the best Address statement in our own host config file
+       char filename[PATH_MAX] = "";
+       snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->self->name);
+       scan_for_hostname(filename, &hostname[0], &port[0]);
+
+       hostname[1] = meshlink_get_external_address_for_family(mesh, AF_INET);
+       hostname[2] = meshlink_get_external_address_for_family(mesh, AF_INET6);
+
+       // Concatenate all unique address to the hostport string
+       for (int i = 0; i < 3; i++) {
+               if (!hostname[i])
+                       continue;
+
+               // Ignore duplicate hostnames
+               bool found = false;
+
+               for (int j = 0; i < j; j++) {
+                       if (safe_streq(hostname[i], hostname[j]) && safe_streq(port[i], port[j])) {
+                               found = true;
+                               break;
+                       }
+               }
+
+               if (found) {
+                       free(hostname[i]);
+                       free(port[i]);
+                       hostname[i] = NULL;
+                       port[i] = NULL;
+                       continue;
+               }
+
+               // Ensure we have the same addresses in our own host config file.
+               char *tmphostport;
+               xasprintf(&tmphostport, "%s %s", hostname[i], port[i] ? port[i] : mesh->myport);
+               append_config_file(mesh, mesh->self->name, "Address", tmphostport);
+               free(tmphostport);
+
+               // Append the address to the hostport string
+               char *newhostport;
+               xasprintf(&newhostport, (strchr(hostname[i], ':') ? "%s%s[%s]:%s" : "%s%s%s:%s"), hostport ? hostport : "", hostport ? "," : "", hostname[i], port[i] ? port[i] : mesh->myport);
+               free(hostname[i]);
+               free(port[i]);
+               free(hostport);
+               hostport = newhostport;
        }
 
-       free(hostname);
-       free(port);
        return hostport;
 }
 
 static char *get_line(const char **data) {
-       if(!data || !*data)
+       if(!data || !*data) {
                return NULL;
+       }
 
-       if(!**data) {
+       if(! **data) {
                *data = NULL;
                return NULL;
        }
 
        static char line[1024];
        const char *end = strchr(*data, '\n');
-       size_t len = end ? end - *data : strlen(*data);
-       if(len >= sizeof line) {
+       size_t len = end ? (size_t)(end - *data) : strlen(*data);
+
+       if(len >= sizeof(line)) {
                logger(NULL, MESHLINK_ERROR, "Maximum line length exceeded!\n");
                return NULL;
        }
-       if(len && !isprint(**data))
+
+       if(len && !isprint(**data)) {
                abort();
+       }
 
        memcpy(line, *data, len);
        line[len] = 0;
 
-       if(end)
+       if(end) {
                *data = end + 1;
-       else
+       } else {
                *data = NULL;
+       }
 
        return line;
 }
 
 static char *get_value(const char *data, const char *var) {
        char *line = get_line(&data);
-       if(!line)
+
+       if(!line) {
                return NULL;
+       }
 
        char *sep = line + strcspn(line, " \t=");
        char *val = sep + strspn(sep, " \t");
-       if(*val == '=')
+
+       if(*val == '=') {
                val += 1 + strspn(val + 1, " \t");
+       }
+
        *sep = 0;
-       if(strcasecmp(line, var))
+
+       if(strcasecmp(line, var)) {
                return NULL;
+       }
+
        return val;
 }
 
@@ -330,23 +478,28 @@ static bool try_bind(int port) {
        };
 
        char portstr[16];
-       snprintf(portstr, sizeof portstr, "%d", port);
+       snprintf(portstr, sizeof(portstr), "%d", port);
 
-       if(getaddrinfo(NULL, portstr, &hint, &ai) || !ai)
+       if(getaddrinfo(NULL, portstr, &hint, &ai) || !ai) {
                return false;
+       }
 
        while(ai) {
                int fd = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
+
                if(!fd) {
                        freeaddrinfo(ai);
                        return false;
                }
+
                int result = bind(fd, ai->ai_addr, ai->ai_addrlen);
                closesocket(fd);
+
                if(result) {
                        freeaddrinfo(ai);
                        return false;
                }
+
                ai = ai->ai_next;
        }
 
@@ -354,15 +507,18 @@ static bool try_bind(int port) {
        return true;
 }
 
-static int check_port(meshlink_handle_t *mesh) {
+int check_port(meshlink_handle_t *mesh) {
        for(int i = 0; i < 1000; i++) {
                int port = 0x1000 + (rand() & 0x7fff);
+
                if(try_bind(port)) {
                        char filename[PATH_MAX];
-                       snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->name);
+                       snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->name);
                        FILE *f = fopen(filename, "a");
+
                        if(!f) {
-                               logger(mesh, MESHLINK_DEBUG, "Please change MeshLink's Port manually.\n");
+                               meshlink_errno = MESHLINK_ESTORAGE;
+                               logger(mesh, MESHLINK_DEBUG, "Could not store Port.\n");
                                return 0;
                        }
 
@@ -372,12 +528,39 @@ static int check_port(meshlink_handle_t *mesh) {
                }
        }
 
-       logger(mesh, MESHLINK_DEBUG, "Please change MeshLink's Port manually.\n");
+       meshlink_errno = MESHLINK_ENETWORK;
+       logger(mesh, MESHLINK_DEBUG, "Could not find any available network port.\n");
        return 0;
 }
 
+static void deltree(const char *dirname) {
+       DIR *d = opendir(dirname);
+
+       if(d) {
+               struct dirent *ent;
+
+               while((ent = readdir(d))) {
+                       if(ent->d_name[0] == '.') {
+                               continue;
+                       }
+
+                       char filename[PATH_MAX];
+                       snprintf(filename, sizeof(filename), "%s" SLASH "%s", dirname, ent->d_name);
+
+                       if(unlink(filename)) {
+                               deltree(filename);
+                       }
+               }
+
+               closedir(d);
+       }
+
+       rmdir(dirname);
+}
+
 static bool finalize_join(meshlink_handle_t *mesh) {
        char *name = xstrdup(get_value(mesh->data, "Name"));
+
        if(!name) {
                logger(mesh, MESHLINK_DEBUG, "No Name found in invitation!\n");
                return false;
@@ -389,9 +572,10 @@ static bool finalize_join(meshlink_handle_t *mesh) {
        }
 
        char filename[PATH_MAX];
-       snprintf(filename, sizeof filename, "%s" SLASH "meshlink.conf", mesh->confbase);
+       snprintf(filename, sizeof(filename), "%s" SLASH "meshlink.conf", mesh->confbase);
 
        FILE *f = fopen(filename, "w");
+
        if(!f) {
                logger(mesh, MESHLINK_DEBUG, "Could not create file %s: %s\n", filename, strerror(errno));
                return false;
@@ -399,8 +583,22 @@ static bool finalize_join(meshlink_handle_t *mesh) {
 
        fprintf(f, "Name = %s\n", name);
 
-       snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+       // Wipe all old host config files and invitations
+       snprintf(filename, sizeof(filename), "%s" SLASH "hosts", mesh->confbase);
+       deltree(filename);
+
+       if(mkdir(filename, 0777) && errno != EEXIST) {
+               logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", filename, strerror(errno));
+               return false;
+       }
+
+       snprintf(filename, sizeof(filename), "%s" SLASH "invitations", mesh->confbase);
+       deltree(filename);
+
+       // Create a new host config file for ourself
+       snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
        FILE *fh = fopen(filename, "w");
+
        if(!fh) {
                logger(mesh, MESHLINK_DEBUG, "Could not create file %s: %s\n", filename, strerror(errno));
                fclose(f);
@@ -414,34 +612,41 @@ static bool finalize_join(meshlink_handle_t *mesh) {
 
        while((l = get_line(&p))) {
                // Ignore comments
-               if(*l == '#')
+               if(*l == '#') {
                        continue;
+               }
 
                // Split line into variable and value
                int len = strcspn(l, "\t =");
                value = l + len;
                value += strspn(value, "\t ");
+
                if(*value == '=') {
                        value++;
                        value += strspn(value, "\t ");
                }
+
                l[len] = 0;
 
                // Is it a Name?
                if(!strcasecmp(l, "Name"))
-                       if(strcmp(value, name))
+                       if(strcmp(value, name)) {
                                break;
-                       else
+                       } else {
                                continue;
-               else if(!strcasecmp(l, "NetName"))
+                       } else if(!strcasecmp(l, "NetName")) {
                        continue;
+               }
 
-               // Check the list of known variables //TODO: most variables will not be available in meshlink, only name and key will be absolutely necessary
+               // Check the list of known variables
                bool found = false;
                int i;
+
                for(i = 0; variables[i].name; i++) {
-                       if(strcasecmp(l, variables[i].name))
+                       if(strcasecmp(l, variables[i].name)) {
                                continue;
+                       }
+
                        found = true;
                        break;
                }
@@ -472,7 +677,7 @@ static bool finalize_join(meshlink_handle_t *mesh) {
                        return false;
                }
 
-               snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, value);
+               snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, value);
                f = fopen(filename, "w");
 
                if(!f) {
@@ -481,16 +686,21 @@ static bool finalize_join(meshlink_handle_t *mesh) {
                }
 
                while((l = get_line(&p))) {
-                       if(!strcmp(l, "#---------------------------------------------------------------#"))
+                       if(!strcmp(l, "#---------------------------------------------------------------#")) {
                                continue;
+                       }
+
                        int len = strcspn(l, "\t =");
+
                        if(len == 4 && !strncasecmp(l, "Name", 4)) {
                                value = l + len;
                                value += strspn(value, "\t ");
+
                                if(*value == '=') {
                                        value++;
                                        value += strspn(value, "\t ");
                                }
+
                                l[len] = 0;
                                break;
                        }
@@ -503,8 +713,11 @@ static bool finalize_join(meshlink_handle_t *mesh) {
        }
 
        char *b64key = ecdsa_get_base64_public_key(mesh->self->connection->ecdsa);
-       if(!b64key)
+
+       if(!b64key) {
+               fclose(fh);
                return false;
+       }
 
        fprintf(fh, "ECDSAPublicKey = %s\n", b64key);
        fprintf(fh, "Port = %s\n", mesh->myport);
@@ -514,8 +727,10 @@ static bool finalize_join(meshlink_handle_t *mesh) {
        sptps_send_record(&(mesh->sptps), 1, b64key, strlen(b64key));
        free(b64key);
 
+       free(mesh->name);
        free(mesh->self->name);
        free(mesh->self->connection->name);
+       mesh->name = xstrdup(name);
        mesh->self->name = xstrdup(name);
        mesh->self->connection->name = name;
 
@@ -527,65 +742,79 @@ static bool finalize_join(meshlink_handle_t *mesh) {
 }
 
 static bool invitation_send(void *handle, uint8_t type, const void *data, size_t len) {
-       meshlink_handle_t* mesh = handle;
+       (void)type;
+       meshlink_handle_t *mesh = handle;
+       const char *ptr = data;
+
        while(len) {
-               int result = send(mesh->sock, data, len, 0);
-               if(result == -1 && errno == EINTR)
+               int result = send(mesh->sock, ptr, len, 0);
+
+               if(result == -1 && errno == EINTR) {
                        continue;
-               else if(result <= 0)
+               } else if(result <= 0) {
                        return false;
-               data += result;
+               }
+
+               ptr += result;
                len -= result;
        }
+
        return true;
 }
 
 static bool invitation_receive(void *handle, uint8_t type, const void *msg, uint16_t len) {
-       meshlink_handle_t* mesh = handle;
-       switch(type) {
-               case SPTPS_HANDSHAKE:
-                       return sptps_send_record(&(mesh->sptps), 0, mesh->cookie, sizeof mesh->cookie);
-
-               case 0:
-                       mesh->data = xrealloc(mesh->data, mesh->thedatalen + len + 1);
-                       memcpy(mesh->data + mesh->thedatalen, msg, len);
-                       mesh->thedatalen += len;
-                       mesh->data[mesh->thedatalen] = 0;
-                       break;
-
-               case 1:
-                       return finalize_join(mesh);
+       meshlink_handle_t *mesh = handle;
 
-               case 2:
-                       logger(mesh, MESHLINK_DEBUG, "Invitation succesfully accepted.\n");
-                       shutdown(mesh->sock, SHUT_RDWR);
-                       mesh->success = true;
-                       break;
-
-               default:
-                       return false;
+       switch(type) {
+       case SPTPS_HANDSHAKE:
+               return sptps_send_record(&(mesh->sptps), 0, mesh->cookie, sizeof(mesh)->cookie);
+
+       case 0:
+               mesh->data = xrealloc(mesh->data, mesh->thedatalen + len + 1);
+               memcpy(mesh->data + mesh->thedatalen, msg, len);
+               mesh->thedatalen += len;
+               mesh->data[mesh->thedatalen] = 0;
+               break;
+
+       case 1:
+               mesh->thedatalen = 0;
+               return finalize_join(mesh);
+
+       case 2:
+               logger(mesh, MESHLINK_DEBUG, "Invitation succesfully accepted.\n");
+               shutdown(mesh->sock, SHUT_RDWR);
+               mesh->success = true;
+               break;
+
+       default:
+               return false;
        }
 
        return true;
 }
 
-static bool recvline(meshlink_handle_tmesh, size_t len) {
+static bool recvline(meshlink_handle_t *mesh, size_t len) {
        char *newline = NULL;
 
-       if(!mesh->sock)
+       if(!mesh->sock) {
                abort();
+       }
 
        while(!(newline = memchr(mesh->buffer, '\n', mesh->blen))) {
-               int result = recv(mesh->sock, mesh->buffer + mesh->blen, sizeof mesh->buffer - mesh->blen, 0);
-               if(result == -1 && errno == EINTR)
+               int result = recv(mesh->sock, mesh->buffer + mesh->blen, sizeof(mesh)->buffer - mesh->blen, 0);
+
+               if(result == -1 && errno == EINTR) {
                        continue;
-               else if(result <= 0)
+               } else if(result <= 0) {
                        return false;
+               }
+
                mesh->blen += result;
        }
 
-       if(newline - mesh->buffer >= len)
+       if((size_t)(newline - mesh->buffer) >= len) {
                return false;
+       }
 
        len = newline - mesh->buffer;
 
@@ -603,21 +832,25 @@ static bool sendline(int fd, char *format, ...) {
        va_list ap;
 
        va_start(ap, format);
-       blen = vsnprintf(buffer, sizeof buffer, format, ap);
+       blen = vsnprintf(buffer, sizeof(buffer), format, ap);
        va_end(ap);
 
-       if(blen < 1 || blen >= sizeof buffer)
+       if(blen < 1 || (size_t)blen >= sizeof(buffer)) {
                return false;
+       }
 
        buffer[blen] = '\n';
        blen++;
 
        while(blen) {
                int result = send(fd, p, blen, MSG_NOSIGNAL);
-               if(result == -1 && errno == EINTR)
+
+               if(result == -1 && errno == EINTR) {
                        continue;
-               else if(result <= 0)
+               } else if(result <= 0) {
                        return false;
+               }
+
                p += result;
                blen -= result;
        }
@@ -636,11 +869,15 @@ static const char *errstr[] = {
        [MESHLINK_ESTORAGE] = "Storage error",
        [MESHLINK_ENETWORK] = "Network error",
        [MESHLINK_EPEER] = "Error communicating with peer",
+       [MESHLINK_ENOTSUP] = "Operation not supported",
+       [MESHLINK_EBUSY] = "MeshLink instance already in use",
 };
 
 const char *meshlink_strerror(meshlink_errno_t err) {
-       if(err < 0 || err >= sizeof errstr / sizeof *errstr)
+       if((int)err < 0 || err >= sizeof(errstr) / sizeof(*errstr)) {
                return "Invalid error code";
+       }
+
        return errstr[err];
 }
 
@@ -655,11 +892,17 @@ static bool ecdsa_keygen(meshlink_handle_t *mesh) {
                logger(mesh, MESHLINK_DEBUG, "Error during key generation!\n");
                meshlink_errno = MESHLINK_EINTERNAL;
                return false;
-       } else
+       } else {
                logger(mesh, MESHLINK_DEBUG, "Done.\n");
+       }
+
+       if(snprintf(privname, sizeof(privname), "%s" SLASH "ecdsa_key.priv", mesh->confbase) >= PATH_MAX) {
+               logger(mesh, MESHLINK_DEBUG, "Filename too long: %s" SLASH "ecdsa_key.priv\n", mesh->confbase);
+               meshlink_errno = MESHLINK_ESTORAGE;
+               return false;
+       }
 
-       snprintf(privname, sizeof privname, "%s" SLASH "ecdsa_key.priv", mesh->confbase);
-       f = fopen(privname, "w");
+       f = fopen(privname, "wb");
 
        if(!f) {
                meshlink_errno = MESHLINK_ESTORAGE;
@@ -680,7 +923,7 @@ static bool ecdsa_keygen(meshlink_handle_t *mesh) {
 
        fclose(f);
 
-       snprintf(pubname, sizeof pubname, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->name);
+       snprintf(pubname, sizeof(pubname), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->name);
        f = fopen(pubname, "a");
 
        if(!f) {
@@ -698,6 +941,46 @@ static bool ecdsa_keygen(meshlink_handle_t *mesh) {
        return true;
 }
 
+static struct timeval idle(event_loop_t *loop, void *data) {
+       (void)loop;
+       meshlink_handle_t *mesh = data;
+       struct timeval t, tmin = {3600, 0};
+
+       for splay_each(node_t, n, mesh->nodes) {
+               if(!n->utcp) {
+                       continue;
+               }
+
+               t = utcp_timeout(n->utcp);
+
+               if(timercmp(&t, &tmin, <)) {
+                       tmin = t;
+               }
+       }
+
+       return tmin;
+}
+
+// Get our local address(es) by simulating connecting to an Internet host.
+static void add_local_addresses(meshlink_handle_t *mesh) {
+       char host[NI_MAXHOST];
+       char entry[MAX_STRING_SIZE];
+
+       // IPv4 example.org
+
+       if(getlocaladdrname("93.184.216.34", host, sizeof(host))) {
+               snprintf(entry, sizeof(entry), "%s %s", host, mesh->myport);
+               append_config_file(mesh, mesh->name, "Address", entry);
+       }
+
+       // IPv6 example.org
+
+       if(getlocaladdrname("2606:2800:220:1:248:1893:25c8:1946", host, sizeof(host))) {
+               snprintf(entry, sizeof(entry), "%s %s", host, mesh->myport);
+               append_config_file(mesh, mesh->name, "Address", entry);
+       }
+}
+
 static bool meshlink_setup(meshlink_handle_t *mesh) {
        if(mkdir(mesh->confbase, 0777) && errno != EEXIST) {
                logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", mesh->confbase, strerror(errno));
@@ -706,7 +989,7 @@ static bool meshlink_setup(meshlink_handle_t *mesh) {
        }
 
        char filename[PATH_MAX];
-       snprintf(filename, sizeof filename, "%s" SLASH "hosts", mesh->confbase);
+       snprintf(filename, sizeof(filename), "%s" SLASH "hosts", mesh->confbase);
 
        if(mkdir(filename, 0777) && errno != EEXIST) {
                logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", filename, strerror(errno));
@@ -714,7 +997,7 @@ static bool meshlink_setup(meshlink_handle_t *mesh) {
                return false;
        }
 
-       snprintf(filename, sizeof filename, "%s" SLASH "meshlink.conf", mesh->confbase);
+       snprintf(filename, sizeof(filename), "%s" SLASH "meshlink.conf", mesh->confbase);
 
        if(!access(filename, F_OK)) {
                logger(mesh, MESHLINK_DEBUG, "Configuration file %s already exists!\n", filename);
@@ -723,6 +1006,7 @@ static bool meshlink_setup(meshlink_handle_t *mesh) {
        }
 
        FILE *f = fopen(filename, "w");
+
        if(!f) {
                logger(mesh, MESHLINK_DEBUG, "Could not create file %s: %s\n", filename, strerror(errno));
                meshlink_errno = MESHLINK_ESTORAGE;
@@ -734,23 +1018,25 @@ static bool meshlink_setup(meshlink_handle_t *mesh) {
 
        if(!ecdsa_keygen(mesh)) {
                meshlink_errno = MESHLINK_EINTERNAL;
+               unlink(filename);
                return false;
        }
 
-       check_port(mesh);
+       if(check_port(mesh) == 0) {
+               meshlink_errno = MESHLINK_ENETWORK;
+               unlink(filename);
+               return false;
+       }
 
        return true;
 }
 
-meshlink_handle_t *meshlink_open(const char *confbase, const char *name, const char* appname, dev_class_t devclass) {
-       return meshlink_open_with_size(confbase, name, appname, devclass, sizeof(meshlink_handle_t));
-}
-
-meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *name, const char* appname, dev_class_t devclass, size_t size) {
-
+meshlink_handle_t *meshlink_open(const char *confbase, const char *name, const char *appname, dev_class_t devclass) {
        // Validate arguments provided by the application
        bool usingname = false;
 
+       logger(NULL, MESHLINK_DEBUG, "meshlink_open called\n");
+
        if(!confbase || !*confbase) {
                logger(NULL, MESHLINK_ERROR, "No confbase given!\n");
                meshlink_errno = MESHLINK_EINVAL;
@@ -763,39 +1049,59 @@ meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *nam
                return NULL;
        }
 
+       if(strchr(appname, ' ')) {
+               logger(NULL, MESHLINK_ERROR, "Invalid appname given!\n");
+               meshlink_errno = MESHLINK_EINVAL;
+               return NULL;
+       }
+
        if(!name || !*name) {
                logger(NULL, MESHLINK_ERROR, "No name given!\n");
                //return NULL;
-       }
-       else { //check name only if there is a name != NULL
+       } else { //check name only if there is a name != NULL
 
                if(!check_id(name)) {
                        logger(NULL, MESHLINK_ERROR, "Invalid name given!\n");
                        meshlink_errno = MESHLINK_EINVAL;
                        return NULL;
-               } else { usingname = true;}
+               } else {
+                       usingname = true;
+               }
        }
 
-       if(devclass < 0 || devclass > _DEV_CLASS_MAX) {
+       if((int)devclass < 0 || devclass > _DEV_CLASS_MAX) {
                logger(NULL, MESHLINK_ERROR, "Invalid devclass given!\n");
                meshlink_errno = MESHLINK_EINVAL;
                return NULL;
        }
 
-       meshlink_handle_t *mesh = xzalloc(size);
+       meshlink_handle_t *mesh = xzalloc(sizeof(meshlink_handle_t));
        mesh->confbase = xstrdup(confbase);
        mesh->appname = xstrdup(appname);
        mesh->devclass = devclass;
-       if (usingname) mesh->name = xstrdup(name);
-       pthread_mutex_init ( &(mesh->nodes_mutex), NULL);
+       mesh->discovery = true;
+       mesh->invitation_timeout = 604800; // 1 week
+
+       if(usingname) {
+               mesh->name = xstrdup(name);
+       }
+
+       // initialize mutex
+       pthread_mutexattr_t attr;
+       pthread_mutexattr_init(&attr);
+       pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
+       pthread_mutex_init(&(mesh->mesh_mutex), &attr);
+
        mesh->threadstarted = false;
        event_loop_init(&mesh->loop);
        mesh->loop.data = mesh;
 
+       meshlink_queue_init(&mesh->outpacketqueue);
+
        // Check whether meshlink.conf already exists
 
        char filename[PATH_MAX];
-       snprintf(filename, sizeof filename, "%s" SLASH "meshlink.conf", confbase);
+       snprintf(filename, sizeof(filename), "%s" SLASH "meshlink.conf", confbase);
 
        if(access(filename, R_OK)) {
                if(errno == ENOENT) {
@@ -812,6 +1118,32 @@ meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *nam
                }
        }
 
+       // Open the configuration file and lock it
+
+       mesh->conffile = fopen(filename, "r");
+
+       if(!mesh->conffile) {
+               logger(NULL, MESHLINK_ERROR, "Cannot not open %s: %s\n", filename, strerror(errno));
+               meshlink_close(mesh);
+               meshlink_errno = MESHLINK_ESTORAGE;
+               return NULL;
+       }
+
+#ifdef FD_CLOEXEC
+       fcntl(fileno(mesh->conffile), F_SETFD, FD_CLOEXEC);
+#endif
+
+#ifdef HAVE_MINGW
+       // TODO: use _locking()?
+#else
+       if(flock(fileno(mesh->conffile), LOCK_EX | LOCK_NB) != 0) {
+               logger(NULL, MESHLINK_ERROR, "Cannot lock %s: %s\n", filename, strerror(errno));
+               meshlink_close(mesh);
+               meshlink_errno = MESHLINK_EBUSY;
+               return NULL;
+       }
+#endif
+
        // Read the configuration
 
        init_configuration(&mesh->config);
@@ -824,7 +1156,9 @@ meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *nam
 
 #ifdef HAVE_MINGW
        struct WSAData wsa_state;
+
        WSAStartup(MAKEWORD(2, 2), &wsa_state);
+
 #endif
 
        // Setup up everything
@@ -836,86 +1170,151 @@ meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *nam
                return NULL;
        }
 
+       add_local_addresses(mesh);
+
+       idle_set(&mesh->loop, idle, mesh);
+
+       logger(NULL, MESHLINK_DEBUG, "meshlink_open returning\n");
        return mesh;
 }
 
 static void *meshlink_main_loop(void *arg) {
        meshlink_handle_t *mesh = arg;
 
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+
        try_outgoing_connections(mesh);
 
        logger(mesh, MESHLINK_DEBUG, "Starting main_loop...\n");
        main_loop(mesh);
        logger(mesh, MESHLINK_DEBUG, "main_loop returned.\n");
 
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
        return NULL;
 }
 
 bool meshlink_start(meshlink_handle_t *mesh) {
+       if(!mesh) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return false;
+       }
 
        logger(mesh, MESHLINK_DEBUG, "meshlink_start called\n");
 
-       if(!mesh) {
-               meshlink_errno = MESHLINK_EINVAL;
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+
+       if(mesh->threadstarted) {
+               logger(mesh, MESHLINK_DEBUG, "thread was already running\n");
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
+               return true;
+       }
+
+       if(mesh->listen_socket[0].tcp.fd < 0) {
+               logger(mesh, MESHLINK_ERROR, "Listening socket not open\n");
+               meshlink_errno = MESHLINK_ENETWORK;
                return false;
        }
 
+       mesh->thedatalen = 0;
+
        // TODO: open listening sockets first
 
        //Check that a valid name is set
-       if(!mesh->name ) {
+       if(!mesh->name) {
                logger(mesh, MESHLINK_DEBUG, "No name given!\n");
                meshlink_errno = MESHLINK_EINVAL;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
        // Start the main thread
 
+       event_loop_start(&mesh->loop);
+
        if(pthread_create(&mesh->thread, NULL, meshlink_main_loop, mesh) != 0) {
                logger(mesh, MESHLINK_DEBUG, "Could not start thread: %s\n", strerror(errno));
-               memset(&mesh->thread, 0, sizeof mesh->thread);
+               memset(&mesh->thread, 0, sizeof(mesh)->thread);
                meshlink_errno = MESHLINK_EINTERNAL;
+               event_loop_stop(&mesh->loop);
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
-       mesh->threadstarted=true;
+       mesh->threadstarted = true;
 
-       discovery_start(mesh);
+#if HAVE_CATTA
 
+       if(mesh->discovery) {
+               discovery_start(mesh);
+       }
+
+#endif
+
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
        return true;
 }
 
 void meshlink_stop(meshlink_handle_t *mesh) {
-
-       logger(mesh, MESHLINK_DEBUG, "meshlink_stop called\n");
-       
        if(!mesh) {
                meshlink_errno = MESHLINK_EINVAL;
                return;
        }
 
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+       logger(mesh, MESHLINK_DEBUG, "meshlink_stop called\n");
+
+#if HAVE_CATTA
+
        // Stop discovery
-       discovery_stop(mesh);
+       if(mesh->discovery) {
+               discovery_stop(mesh);
+       }
 
-       // Shut down a listening socket to signal the main thread to shut down
+#endif
 
-       listen_socket_t *s = &mesh->listen_socket[0];
-       shutdown(s->tcp.fd, SHUT_RDWR);
+       // Shut down the main thread
+       event_loop_stop(&mesh->loop);
 
-       // Wait for the main thread to finish
+       // Send ourselves a UDP packet to kick the event loop
+       for(int i = 0; i < mesh->listen_sockets; i++) {
+               sockaddr_t sa;
+               socklen_t salen = sizeof(sa.sa);
 
-       pthread_join(mesh->thread, NULL);
-       mesh->threadstarted = false;
+               if(getsockname(mesh->listen_socket[i].udp.fd, &sa.sa, &salen) == -1) {
+                       logger(mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "getsockname", sockstrerror(sockerrno));
+                       continue;
+               }
 
-       // Fix the socket
-       
-       closesocket(s->tcp.fd);
-       io_del(&mesh->loop, &s->tcp);
-       s->tcp.fd = setup_listen_socket(&s->sa);
-       if(s->tcp.fd < 0)
-               logger(mesh, MESHLINK_ERROR, "Could not repair listenen socket!");
-       else
-               io_add(&mesh->loop, &s->tcp, handle_new_meta_connection, s, s->tcp.fd, IO_READ);
+               if(sendto(mesh->listen_socket[i].udp.fd, "", 1, MSG_NOSIGNAL, &sa.sa, salen) == -1) {
+                       logger(mesh, MESHLINK_ERROR, "Could not send a UDP packet to ourself: %s", sockstrerror(sockerrno));
+               }
+       }
+
+       if(mesh->threadstarted) {
+               // Wait for the main thread to finish
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
+               pthread_join(mesh->thread, NULL);
+               pthread_mutex_lock(&(mesh->mesh_mutex));
+
+               mesh->threadstarted = false;
+       }
+
+       // Close all metaconnections
+       if(mesh->connections) {
+               for(list_node_t *node = mesh->connections->head, *next; node; node = next) {
+                       next = node->next;
+                       connection_t *c = node->data;
+                       c->outgoing = NULL;
+                       terminate_connection(mesh, c, false);
+               }
+       }
+
+       if(mesh->outgoings) {
+               list_delete_list(mesh->outgoings);
+               mesh->outgoings = NULL;
+       }
+
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
 }
 
 void meshlink_close(meshlink_handle_t *mesh) {
@@ -924,6 +1323,12 @@ void meshlink_close(meshlink_handle_t *mesh) {
                return;
        }
 
+       // stop can be called even if mesh has not been started
+       meshlink_stop(mesh);
+
+       // lock is not released after this
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+
        // Close and free all resources used.
 
        close_network_connections(mesh);
@@ -934,8 +1339,11 @@ void meshlink_close(meshlink_handle_t *mesh) {
        event_loop_exit(&mesh->loop);
 
 #ifdef HAVE_MINGW
-       if(mesh->confbase)
+
+       if(mesh->confbase) {
                WSACleanup();
+       }
+
 #endif
 
        ecdsa_free(mesh->invitation_key);
@@ -943,19 +1351,51 @@ void meshlink_close(meshlink_handle_t *mesh) {
        free(mesh->name);
        free(mesh->appname);
        free(mesh->confbase);
+       pthread_mutex_destroy(&(mesh->mesh_mutex));
+
+       if(mesh->conffile) {
+               fclose(mesh->conffile);
+        }
 
-       memset(mesh, 0, sizeof *mesh);
+       memset(mesh, 0, sizeof(*mesh));
 
        free(mesh);
 }
 
+bool meshlink_destroy(const char *confbase) {
+       if(!confbase) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return false;
+       }
+
+       char filename[PATH_MAX];
+       snprintf(filename, sizeof(filename), "%s" SLASH "meshlink.conf", confbase);
+
+       if(unlink(filename)) {
+               if(errno == ENOENT) {
+                       meshlink_errno = MESHLINK_ENOENT;
+                       return false;
+               } else {
+                       logger(NULL, MESHLINK_ERROR, "Cannot delete %s: %s\n", filename, strerror(errno));
+                       meshlink_errno = MESHLINK_ESTORAGE;
+                       return false;
+               }
+       }
+
+       deltree(confbase);
+
+       return true;
+}
+
 void meshlink_set_receive_cb(meshlink_handle_t *mesh, meshlink_receive_cb_t cb) {
        if(!mesh) {
                meshlink_errno = MESHLINK_EINVAL;
                return;
        }
 
+       pthread_mutex_lock(&(mesh->mesh_mutex));
        mesh->receive_cb = cb;
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
 }
 
 void meshlink_set_node_status_cb(meshlink_handle_t *mesh, meshlink_node_status_cb_t cb) {
@@ -964,13 +1404,28 @@ void meshlink_set_node_status_cb(meshlink_handle_t *mesh, meshlink_node_status_c
                return;
        }
 
+       pthread_mutex_lock(&(mesh->mesh_mutex));
        mesh->node_status_cb = cb;
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
+}
+
+void meshlink_set_node_duplicate_cb(meshlink_handle_t *mesh, meshlink_node_duplicate_cb_t cb) {
+       if(!mesh) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return;
+       }
+
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+       mesh->node_duplicate_cb = cb;
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
 }
 
 void meshlink_set_log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, meshlink_log_cb_t cb) {
        if(mesh) {
+               pthread_mutex_lock(&(mesh->mesh_mutex));
                mesh->log_cb = cb;
                mesh->log_level = cb ? level : 0;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
        } else {
                global_log_cb = cb;
                global_log_level = cb ? level : 0;
@@ -978,59 +1433,68 @@ void meshlink_set_log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, me
 }
 
 bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, size_t len) {
-       if(!mesh || !destination) {
+       meshlink_packethdr_t *hdr;
+
+       // Validate arguments
+       if(!mesh || !destination || len >= MAXSIZE - sizeof(*hdr)) {
                meshlink_errno = MESHLINK_EINVAL;
                return false;
        }
 
-       if(!len)
+       if(!len) {
                return true;
+       }
 
        if(!data) {
                meshlink_errno = MESHLINK_EINVAL;
                return false;
        }
 
-       //add packet to the queue
-       outpacketqueue_t *packet_in_queue = xzalloc(sizeof *packet_in_queue);
-       packet_in_queue->destination=destination;
-       packet_in_queue->data=data;
-       packet_in_queue->len=len;
-       if(!meshlink_queue_push(&mesh->outpacketqueue, packet_in_queue)) {
-               free(packet_in_queue);
+       // Prepare the packet
+       vpn_packet_t *packet = malloc(sizeof(*packet));
+
+       if(!packet) {
+               meshlink_errno = MESHLINK_ENOMEM;
                return false;
        }
 
-       //notify event loop
-       signal_trigger(&(mesh->loop),&(mesh->datafromapp));
-       return true;
-}
+       packet->probe = false;
+       packet->tcp = false;
+       packet->len = len + sizeof(*hdr);
 
-void meshlink_send_from_queue(event_loop_t* el,meshlink_handle_t *mesh) {
-       vpn_packet_t packet;
-       meshlink_packethdr_t *hdr = (meshlink_packethdr_t *)packet.data;
+       hdr = (meshlink_packethdr_t *)packet->data;
+       memset(hdr, 0, sizeof(*hdr));
+       // leave the last byte as 0 to make sure strings are always
+       // null-terminated if they are longer than the buffer
+       strncpy((char *)hdr->destination, destination->name, (sizeof(hdr)->destination) - 1);
+       strncpy((char *)hdr->source, mesh->self->name, (sizeof(hdr)->source) - 1);
 
-       outpacketqueue_t* p = meshlink_queue_pop(&mesh->outpacketqueue);
-       if(!p)
-               return;
+       memcpy(packet->data + sizeof(*hdr), data, len);
 
-       if (sizeof(meshlink_packethdr_t) + p->len > MAXSIZE) {
-               //log something
-               return ;
+       // Queue it
+       if(!meshlink_queue_push(&mesh->outpacketqueue, packet)) {
+               free(packet);
+               meshlink_errno = MESHLINK_ENOMEM;
+               return false;
        }
 
-       packet.probe = false;
-       memset(hdr, 0, sizeof *hdr);
-       memcpy(hdr->destination, p->destination->name, sizeof hdr->destination);
-       memcpy(hdr->source, mesh->self->name, sizeof hdr->source);
+       // Notify event loop
+       signal_trigger(&(mesh->loop), &(mesh->datafromapp));
 
-       packet.len = sizeof *hdr + p->len;
-       memcpy(packet.data + sizeof *hdr, p->data, p->len);
+       return true;
+}
+
+void meshlink_send_from_queue(event_loop_t *loop, meshlink_handle_t *mesh) {
+       (void)loop;
+       vpn_packet_t *packet = meshlink_queue_pop(&mesh->outpacketqueue);
 
-        mesh->self->in_packets++;
-        mesh->self->in_bytes += packet.len;
-        route(mesh, mesh->self, &packet);
-       return ;
+       if(!packet) {
+               return;
+       }
+
+       mesh->self->in_packets++;
+       mesh->self->in_bytes += packet->len;
+       route(mesh, mesh->self, packet);
 }
 
 ssize_t meshlink_get_pmtu(meshlink_handle_t *mesh, meshlink_node_t *destination) {
@@ -1039,13 +1503,21 @@ ssize_t meshlink_get_pmtu(meshlink_handle_t *mesh, meshlink_node_t *destination)
                return -1;
        }
 
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+
        node_t *n = (node_t *)destination;
-       if(!n->status.reachable)
+
+       if(!n->status.reachable) {
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return 0;
-       else if(n->mtuprobes > 30 && n->minmtu)
+
+       } else if(n->mtuprobes > 30 && n->minmtu) {
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return n->minmtu;
-       else
+       } else {
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return MTU;
+       }
 }
 
 char *meshlink_get_fingerprint(meshlink_handle_t *mesh, meshlink_node_t *node) {
@@ -1054,28 +1526,47 @@ char *meshlink_get_fingerprint(meshlink_handle_t *mesh, meshlink_node_t *node) {
                return NULL;
        }
 
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+
        node_t *n = (node_t *)node;
 
        if(!node_read_ecdsa_public_key(mesh, n) || !n->ecdsa) {
                meshlink_errno = MESHLINK_EINTERNAL;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
        char *fingerprint = ecdsa_get_base64_public_key(n->ecdsa);
 
-       if(!fingerprint)
+       if(!fingerprint) {
                meshlink_errno = MESHLINK_EINTERNAL;
+       }
 
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
        return fingerprint;
 }
 
+meshlink_node_t *meshlink_get_self(meshlink_handle_t *mesh) {
+       if(!mesh) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return NULL;
+       }
+
+       return (meshlink_node_t *)mesh->self;
+}
+
 meshlink_node_t *meshlink_get_node(meshlink_handle_t *mesh, const char *name) {
        if(!mesh || !name) {
                meshlink_errno = MESHLINK_EINVAL;
                return NULL;
        }
 
-       return (meshlink_node_t *)lookup_node(mesh, (char *)name); // TODO: make lookup_node() use const
+       meshlink_node_t *node = NULL;
+
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+       node = (meshlink_node_t *)lookup_node(mesh, (char *)name); // TODO: make lookup_node() use const
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
+       return node;
 }
 
 meshlink_node_t **meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes, size_t *nmemb) {
@@ -1087,22 +1578,24 @@ meshlink_node_t **meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_
        meshlink_node_t **result;
 
        //lock mesh->nodes
-       pthread_mutex_lock(&(mesh->nodes_mutex));
+       pthread_mutex_lock(&(mesh->mesh_mutex));
 
        *nmemb = mesh->nodes->count;
-       result = realloc(nodes, *nmemb * sizeof *nodes);
+       result = realloc(nodes, *nmemb * sizeof(*nodes));
 
        if(result) {
                meshlink_node_t **p = result;
-               for splay_each(node_t, n, mesh->nodes)
+
+               for splay_each(node_t, n, mesh->nodes) {
                        *p++ = (meshlink_node_t *)n;
+               }
        } else {
                *nmemb = 0;
                free(nodes);
                meshlink_errno = MESHLINK_ENOMEM;
        }
 
-       pthread_mutex_unlock(&(mesh->nodes_mutex));
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
 
        return result;
 }
@@ -1118,12 +1611,16 @@ bool meshlink_sign(meshlink_handle_t *mesh, const void *data, size_t len, void *
                return false;
        }
 
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+
        if(!ecdsa_sign(mesh->self->connection->ecdsa, data, len, signature)) {
                meshlink_errno = MESHLINK_EINTERNAL;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
        *siglen = MESHLINK_SIGLEN;
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
        return true;
 }
 
@@ -1138,31 +1635,45 @@ bool meshlink_verify(meshlink_handle_t *mesh, meshlink_node_t *source, const voi
                return false;
        }
 
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+
+       bool rval = false;
+
        struct node_t *n = (struct node_t *)source;
        node_read_ecdsa_public_key(mesh, n);
+
        if(!n->ecdsa) {
                meshlink_errno = MESHLINK_EINTERNAL;
-               return false;
+               rval = false;
+       } else {
+               rval = ecdsa_verify(((struct node_t *)source)->ecdsa, data, len, signature);
        }
 
-       return ecdsa_verify(((struct node_t *)source)->ecdsa, data, len, signature);
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
+       return rval;
 }
 
 static bool refresh_invitation_key(meshlink_handle_t *mesh) {
        char filename[PATH_MAX];
 
-       snprintf(filename, sizeof filename, "%s" SLASH "invitations", mesh->confbase);
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+
+       snprintf(filename, sizeof(filename), "%s" SLASH "invitations", mesh->confbase);
+
        if(mkdir(filename, 0700) && errno != EEXIST) {
                logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", filename, strerror(errno));
                meshlink_errno = MESHLINK_ESTORAGE;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
        // Count the number of valid invitations, clean up old ones
        DIR *dir = opendir(filename);
+
        if(!dir) {
                logger(mesh, MESHLINK_DEBUG, "Could not read directory %s: %s\n", filename, strerror(errno));
                meshlink_errno = MESHLINK_ESTORAGE;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
@@ -1172,16 +1683,24 @@ static bool refresh_invitation_key(meshlink_handle_t *mesh) {
        time_t deadline = time(NULL) - 604800; // 1 week in the past
 
        while((ent = readdir(dir))) {
-               if(strlen(ent->d_name) != 24)
+               if(strlen(ent->d_name) != 24) {
                        continue;
+               }
+
                char invname[PATH_MAX];
                struct stat st;
-               snprintf(invname, sizeof invname, "%s" SLASH "%s", filename, ent->d_name);
+
+               if(snprintf(invname, sizeof(invname), "%s" SLASH "%s", filename, ent->d_name) >= PATH_MAX) {
+                       logger(mesh, MESHLINK_DEBUG, "Filename too long: %s" SLASH "%s", filename, ent->d_name);
+                       continue;
+               }
+
                if(!stat(invname, &st)) {
-                       if(mesh->invitation_key && deadline < st.st_mtime)
+                       if(mesh->invitation_key && deadline < st.st_mtime) {
                                count++;
-                       else
+                       } else {
                                unlink(invname);
+                       }
                } else {
                        logger(mesh, MESHLINK_DEBUG, "Could not stat %s: %s\n", invname, strerror(errno));
                        errno = 0;
@@ -1192,76 +1711,200 @@ static bool refresh_invitation_key(meshlink_handle_t *mesh) {
                logger(mesh, MESHLINK_DEBUG, "Error while reading directory %s: %s\n", filename, strerror(errno));
                closedir(dir);
                meshlink_errno = MESHLINK_ESTORAGE;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
        closedir(dir);
 
-       snprintf(filename, sizeof filename, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
+       snprintf(filename, sizeof(filename), "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
 
        // Remove the key if there are no outstanding invitations.
        if(!count) {
                unlink(filename);
+
                if(mesh->invitation_key) {
                        ecdsa_free(mesh->invitation_key);
                        mesh->invitation_key = NULL;
                }
        }
 
-       if(mesh->invitation_key)
+       if(mesh->invitation_key) {
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return true;
+       }
 
        // Create a new key if necessary.
-       FILE *f = fopen(filename, "r");
+       FILE *f = fopen(filename, "rb");
+
        if(!f) {
                if(errno != ENOENT) {
                        logger(mesh, MESHLINK_DEBUG, "Could not read %s: %s\n", filename, strerror(errno));
                        meshlink_errno = MESHLINK_ESTORAGE;
+                       pthread_mutex_unlock(&(mesh->mesh_mutex));
                        return false;
                }
 
                mesh->invitation_key = ecdsa_generate();
+
                if(!mesh->invitation_key) {
                        logger(mesh, MESHLINK_DEBUG, "Could not generate a new key!\n");
                        meshlink_errno = MESHLINK_EINTERNAL;
+                       pthread_mutex_unlock(&(mesh->mesh_mutex));
                        return false;
                }
-               f = fopen(filename, "w");
+
+               f = fopen(filename, "wb");
+
                if(!f) {
                        logger(mesh, MESHLINK_DEBUG, "Could not write %s: %s\n", filename, strerror(errno));
                        meshlink_errno = MESHLINK_ESTORAGE;
+                       pthread_mutex_unlock(&(mesh->mesh_mutex));
                        return false;
                }
+
                chmod(filename, 0600);
                ecdsa_write_pem_private_key(mesh->invitation_key, f);
                fclose(f);
        } else {
                mesh->invitation_key = ecdsa_read_pem_private_key(f);
                fclose(f);
+
                if(!mesh->invitation_key) {
                        logger(mesh, MESHLINK_DEBUG, "Could not read private key from %s\n", filename);
                        meshlink_errno = MESHLINK_ESTORAGE;
                }
        }
 
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
        return mesh->invitation_key;
 }
 
-bool meshlink_add_address(meshlink_handle_t *mesh, const char *address) {
-       if(!mesh || !address) {
+bool meshlink_set_canonical_address(meshlink_handle_t *mesh, meshlink_node_t *node, const char *address, const char *port) {
+       if(!mesh || !node || !address) {
                meshlink_errno = MESHLINK_EINVAL;
                return false;
        }
 
-       for(const char *p = address; *p; p++) {
-               if(isalnum(*p) || *p == '-' || *p == '.' || *p == ':')
-                       continue;
+       if(!is_valid_hostname(address)) {
                logger(mesh, MESHLINK_DEBUG, "Invalid character in address: %s\n", address);
                meshlink_errno = MESHLINK_EINVAL;
                return false;
        }
 
-       return append_config_file(mesh, mesh->self->name, "Address", address);
+       if(port && !is_valid_port(port)) {
+               logger(mesh, MESHLINK_DEBUG, "Invalid character in port: %s\n", address);
+               meshlink_errno = MESHLINK_EINVAL;
+               return false;
+       }
+
+       char *canonical_address;
+
+       if(port) {
+               xasprintf(&canonical_address, "%s %s", address, port);
+       } else {
+               canonical_address = xstrdup(address);
+       }
+
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+       bool rval = modify_config_file(mesh, node->name, "CanonicalAddress", canonical_address, 1);
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
+
+       free(canonical_address);
+       return rval;
+}
+
+bool meshlink_add_address(meshlink_handle_t *mesh, const char *address) {
+       return meshlink_set_canonical_address(mesh, (meshlink_node_t *)mesh->self, address, NULL);
+}
+
+bool meshlink_add_external_address(meshlink_handle_t *mesh) {
+       if(!mesh) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return false;
+       }
+
+       char *address = meshlink_get_external_address(mesh);
+
+       if(!address) {
+               return false;
+       }
+
+       bool rval = false;
+
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+       rval = append_config_file(mesh, mesh->self->name, "Address", address);
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
+
+       free(address);
+       return rval;
+}
+
+int meshlink_get_port(meshlink_handle_t *mesh) {
+       if(!mesh) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return -1;
+       }
+
+       if(!mesh->myport) {
+               meshlink_errno = MESHLINK_EINTERNAL;
+               return -1;
+       }
+
+       return atoi(mesh->myport);
+}
+
+bool meshlink_set_port(meshlink_handle_t *mesh, int port) {
+       if(!mesh || port < 0 || port >= 65536 || mesh->threadstarted) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return false;
+       }
+
+       if(mesh->myport && port == atoi(mesh->myport)) {
+               return true;
+       }
+
+       if(!try_bind(port)) {
+               meshlink_errno = MESHLINK_ENETWORK;
+               return false;
+       }
+
+       bool rval = false;
+
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+
+       if(mesh->threadstarted) {
+               meshlink_errno = MESHLINK_EINVAL;
+               goto done;
+       }
+
+       close_network_connections(mesh);
+       exit_configuration(&mesh->config);
+
+       char portstr[10];
+       snprintf(portstr, sizeof(portstr), "%d", port);
+       portstr[sizeof(portstr) - 1] = 0;
+
+       modify_config_file(mesh, mesh->name, "Port", portstr, true);
+
+       init_configuration(&mesh->config);
+
+       if(!read_server_config(mesh)) {
+               meshlink_errno = MESHLINK_ESTORAGE;
+       } else if(!setup_network(mesh)) {
+               meshlink_errno = MESHLINK_ENETWORK;
+       } else {
+               rval = true;
+       }
+
+done:
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
+
+       return rval;
+}
+
+void meshlink_set_invitation_timeout(meshlink_handle_t *mesh, int timeout) {
+       mesh->invitation_timeout = timeout;
 }
 
 char *meshlink_invite(meshlink_handle_t *mesh, const char *name) {
@@ -1270,19 +1913,24 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) {
                return NULL;
        }
 
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+
        // Check validity of the new node's name
        if(!check_id(name)) {
                logger(mesh, MESHLINK_DEBUG, "Invalid name for node.\n");
                meshlink_errno = MESHLINK_EINVAL;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return NULL;
        }
 
        // Ensure no host configuration file with that name exists
        char filename[PATH_MAX];
-       snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+       snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+
        if(!access(filename, F_OK)) {
                logger(mesh, MESHLINK_DEBUG, "A host config file for %s already exists!\n", name);
                meshlink_errno = MESHLINK_EEXIST;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return NULL;
        }
 
@@ -1290,19 +1938,23 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) {
        if(meshlink_get_node(mesh, name)) {
                logger(mesh, MESHLINK_DEBUG, "A node with name %s is already known!\n", name);
                meshlink_errno = MESHLINK_EEXIST;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return NULL;
        }
 
        // Get the local address
        char *address = get_my_hostname(mesh);
+
        if(!address) {
                logger(mesh, MESHLINK_DEBUG, "No Address known for ourselves!\n");
                meshlink_errno = MESHLINK_ERESOLV;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return NULL;
        }
 
        if(!refresh_invitation_key(mesh)) {
                meshlink_errno = MESHLINK_EINTERNAL;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return NULL;
        }
 
@@ -1321,8 +1973,8 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) {
        char buf[18 + strlen(fingerprint)];
        char cookiehash[64];
        memcpy(buf, cookie, 18);
-       memcpy(buf + 18, fingerprint, sizeof buf - 18);
-       sha512(buf, sizeof buf, cookiehash);
+       memcpy(buf + 18, fingerprint, sizeof(buf) - 18);
+       sha512(buf, sizeof(buf), cookiehash);
        b64encode_urlsafe(cookiehash, cookiehash, 18);
 
        b64encode_urlsafe(cookie, cookie, 18);
@@ -1330,48 +1982,57 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) {
        free(fingerprint);
 
        // Create a file containing the details of the invitation.
-       snprintf(filename, sizeof filename, "%s" SLASH "invitations" SLASH "%s", mesh->confbase, cookiehash);
+       snprintf(filename, sizeof(filename), "%s" SLASH "invitations" SLASH "%s", mesh->confbase, cookiehash);
        int ifd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600);
+
        if(!ifd) {
                logger(mesh, MESHLINK_DEBUG, "Could not create invitation file %s: %s\n", filename, strerror(errno));
                meshlink_errno = MESHLINK_ESTORAGE;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return NULL;
        }
+
        FILE *f = fdopen(ifd, "w");
-       if(!f)
+
+       if(!f) {
                abort();
+       }
 
        // Fill in the details.
        fprintf(f, "Name = %s\n", name);
-       //if(netname)
-       //      fprintf(f, "NetName = %s\n", netname);
        fprintf(f, "ConnectTo = %s\n", mesh->self->name);
 
        // Copy Broadcast and Mode
-       snprintf(filename, sizeof filename, "%s" SLASH "meshlink.conf", mesh->confbase);
+       snprintf(filename, sizeof(filename), "%s" SLASH "meshlink.conf", mesh->confbase);
        FILE *tc = fopen(filename,  "r");
+
        if(tc) {
                char buf[1024];
-               while(fgets(buf, sizeof buf, tc)) {
+
+               while(fgets(buf, sizeof(buf), tc)) {
                        if((!strncasecmp(buf, "Mode", 4) && strchr(" \t=", buf[4]))
-                                       || (!strncasecmp(buf, "Broadcast", 9) && strchr(" \t=", buf[9]))) {
+                                       || (!strncasecmp(buf, "Broadcast", 9) && strchr(" \t=", buf[9]))) {
                                fputs(buf, f);
+
                                // Make sure there is a newline character.
-                               if(!strchr(buf, '\n'))
+                               if(!strchr(buf, '\n')) {
                                        fputc('\n', f);
+                               }
                        }
                }
+
                fclose(tc);
        } else {
                logger(mesh, MESHLINK_DEBUG, "Could not create %s: %s\n", filename, strerror(errno));
                meshlink_errno = MESHLINK_ESTORAGE;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return NULL;
        }
 
        fprintf(f, "#---------------------------------------------------------------#\n");
        fprintf(f, "Name = %s\n", mesh->self->name);
 
-       snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->self->name);
+       snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->self->name);
        fcopy(f, filename);
        fclose(f);
 
@@ -1380,6 +2041,7 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) {
        xasprintf(&url, "%s/%s%s", address, hash, cookie);
        free(address);
 
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
        return url;
 }
 
@@ -1389,92 +2051,139 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
                return false;
        }
 
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+
+       //Before doing meshlink_join make sure we are not connected to another mesh
+       if(mesh->threadstarted) {
+               logger(mesh, MESHLINK_DEBUG, "Already connected to a mesh\n");
+               meshlink_errno = MESHLINK_EINVAL;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
+               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);
 
-       // Split the invitation URL into hostname, port, key hash and cookie.
+       // Split the invitation URL into a list of hostname/port tuples, a key hash and a cookie.
 
        char *slash = strchr(copy, '/');
-       if(!slash)
+
+       if(!slash) {
                goto invalid;
+       }
 
        *slash++ = 0;
 
-       if(strlen(slash) != 48)
+       if(strlen(slash) != 48) {
                goto invalid;
+       }
 
        char *address = copy;
        char *port = NULL;
-       if(*address == '[') {
-               address++;
-               char *bracket = strchr(address, ']');
-               if(!bracket)
-                       goto invalid;
-               *bracket = 0;
-               if(bracket[1] == ':')
-                       port = bracket + 2;
-       } else {
-               port = strchr(address, ':');
-               if(port)
-                       *port++ = 0;
-       }
-
-       if(!port)
-               goto invalid;
 
-       if(!b64decode(slash, mesh->hash, 18) || !b64decode(slash + 24, mesh->cookie, 18))
+       if(!b64decode(slash, mesh->hash, 18) || !b64decode(slash + 24, mesh->cookie, 18)) {
                goto invalid;
+       }
 
        // Generate a throw-away key for the invitation.
        ecdsa_t *key = ecdsa_generate();
+
        if(!key) {
                meshlink_errno = MESHLINK_EINTERNAL;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
        char *b64key = ecdsa_get_base64_public_key(key);
+       char *comma;
+       mesh->sock = -1;
 
-       //Before doing meshlink_join make sure we are not connected to another mesh
-       if ( mesh->threadstarted ){
-               goto invalid;
-       }
+       while(address && *address) {
+               // We allow commas in the address part to support multiple addresses in one invitation URL.
+               comma = strchr(address, ',');
 
-       // Connect to the meshlink daemon mentioned in the URL.
-       struct addrinfo *ai = str2addrinfo(address, port, SOCK_STREAM);
-       if(!ai) {
-               meshlink_errno = MESHLINK_ERESOLV;
-               return false;
-       }
+               if(comma) {
+                       *comma++ = 0;
+               }
 
-       mesh->sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-       if(mesh->sock <= 0) {
-               logger(mesh, MESHLINK_DEBUG, "Could not open socket: %s\n", strerror(errno));
-               freeaddrinfo(ai);
-               meshlink_errno = MESHLINK_ENETWORK;
-               return false;
+               // Split of the port
+               port = strrchr(address, ':');
+
+               if(!port) {
+                       goto invalid;
+               }
+
+               *port++ = 0;
+
+               // IPv6 address are enclosed in brackets, per RFC 3986
+               if(*address == '[') {
+                       address++;
+                       char *bracket = strchr(address, ']');
+
+                       if(!bracket) {
+                               goto invalid;
+                       }
+
+                       *bracket++ = 0;
+
+                       if(*bracket) {
+                               goto invalid;
+                       }
+               }
+
+               // Connect to the meshlink daemon mentioned in the URL.
+               struct addrinfo *ai = str2addrinfo(address, port, SOCK_STREAM);
+
+               if(ai) {
+                       for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
+                               mesh->sock = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol);
+
+                               if(mesh->sock == -1) {
+                                       logger(mesh, MESHLINK_DEBUG, "Could not open socket: %s\n", strerror(errno));
+                                       meshlink_errno = MESHLINK_ENETWORK;
+                                       continue;
+                               }
+
+                               set_timeout(mesh->sock, 5000);
+
+                               if(connect(mesh->sock, aip->ai_addr, aip->ai_addrlen)) {
+                                       logger(mesh, MESHLINK_DEBUG, "Could not connect to %s port %s: %s\n", address, port, strerror(errno));
+                                       meshlink_errno = MESHLINK_ENETWORK;
+                                       closesocket(mesh->sock);
+                                       mesh->sock = -1;
+                                       continue;
+                               }
+                       }
+
+                       freeaddrinfo(ai);
+               } else {
+                       meshlink_errno = MESHLINK_ERESOLV;
+               }
+
+               if(mesh->sock != -1 || !comma) {
+                       break;
+               }
+
+               address = comma;
        }
 
-       if(connect(mesh->sock, ai->ai_addr, ai->ai_addrlen)) {
-               logger(mesh, MESHLINK_DEBUG, "Could not connect to %s port %s: %s\n", address, port, strerror(errno));
-               closesocket(mesh->sock);
-               freeaddrinfo(ai);
-               meshlink_errno = MESHLINK_ENETWORK;
+       if(mesh->sock == -1) {
+               pthread_mutex_unlock(&mesh->mesh_mutex);
                return false;
        }
 
-       freeaddrinfo(ai);
-
        logger(mesh, MESHLINK_DEBUG, "Connected to %s port %s...\n", address, port);
 
        // Tell him we have an invitation, and give him our throw-away key.
 
        mesh->blen = 0;
 
-       if(!sendline(mesh->sock, "0 ?%s %d.%d", b64key, PROT_MAJOR, 1)) {
+       if(!sendline(mesh->sock, "0 ?%s %d.%d %s", b64key, PROT_MAJOR, 1, mesh->appname)) {
                logger(mesh, MESHLINK_DEBUG, "Error sending request to %s port %s: %s\n", address, port, strerror(errno));
                closesocket(mesh->sock);
                meshlink_errno = MESHLINK_ENETWORK;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
@@ -1483,59 +2192,72 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
        char hisname[4096] = "";
        int code, hismajor, hisminor = 0;
 
-       if(!recvline(mesh, sizeof mesh->line) || sscanf(mesh->line, "%d %s %d.%d", &code, hisname, &hismajor, &hisminor) < 3 || code != 0 || hismajor != PROT_MAJOR || !check_id(hisname) || !recvline(mesh, sizeof mesh->line) || !rstrip(mesh->line) || sscanf(mesh->line, "%d ", &code) != 1 || code != ACK || strlen(mesh->line) < 3) {
+       if(!recvline(mesh, sizeof(mesh)->line) || sscanf(mesh->line, "%d %s %d.%d", &code, hisname, &hismajor, &hisminor) < 3 || code != 0 || hismajor != PROT_MAJOR || !check_id(hisname) || !recvline(mesh, sizeof(mesh)->line) || !rstrip(mesh->line) || sscanf(mesh->line, "%d ", &code) != 1 || code != ACK || strlen(mesh->line) < 3) {
                logger(mesh, MESHLINK_DEBUG, "Cannot read greeting from peer\n");
                closesocket(mesh->sock);
                meshlink_errno = MESHLINK_ENETWORK;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
        // Check if the hash of the key he gave us matches the hash in the URL.
        char *fingerprint = mesh->line + 2;
        char hishash[64];
+
        if(sha512(fingerprint, strlen(fingerprint), hishash)) {
                logger(mesh, MESHLINK_DEBUG, "Could not create hash\n%s\n", mesh->line + 2);
                meshlink_errno = MESHLINK_EINTERNAL;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
+
        if(memcmp(hishash, mesh->hash, 18)) {
                logger(mesh, MESHLINK_DEBUG, "Peer has an invalid key!\n%s\n", mesh->line + 2);
                meshlink_errno = MESHLINK_EPEER;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
 
        }
 
        ecdsa_t *hiskey = ecdsa_set_base64_public_key(fingerprint);
+
        if(!hiskey) {
                meshlink_errno = MESHLINK_EINTERNAL;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
        // Start an SPTPS session
-       if(!sptps_start(&mesh->sptps, mesh, true, false, key, hiskey, "meshlink invitation", 15, invitation_send, invitation_receive)) {
+       if(!sptps_start(&mesh->sptps, mesh, true, false, key, hiskey, meshlink_invitation_label, sizeof(meshlink_invitation_label), invitation_send, invitation_receive)) {
                meshlink_errno = MESHLINK_EINTERNAL;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
        // Feed rest of input buffer to SPTPS
        if(!sptps_receive_data(&mesh->sptps, mesh->buffer, mesh->blen)) {
                meshlink_errno = MESHLINK_EPEER;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
        int len;
 
-       while((len = recv(mesh->sock, mesh->line, sizeof mesh->line, 0))) {
+       while((len = recv(mesh->sock, mesh->line, sizeof(mesh)->line, 0))) {
                if(len < 0) {
-                       if(errno == EINTR)
+                       if(errno == EINTR) {
                                continue;
+                       }
+
                        logger(mesh, MESHLINK_DEBUG, "Error reading data from %s port %s: %s\n", address, port, strerror(errno));
                        meshlink_errno = MESHLINK_ENETWORK;
+                       pthread_mutex_unlock(&(mesh->mesh_mutex));
                        return false;
                }
 
                if(!sptps_receive_data(&mesh->sptps, mesh->line, len)) {
                        meshlink_errno = MESHLINK_EPEER;
+                       pthread_mutex_unlock(&(mesh->mesh_mutex));
                        return false;
                }
        }
@@ -1548,14 +2270,17 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) {
        if(!mesh->success) {
                logger(mesh, MESHLINK_DEBUG, "Connection closed by peer, invitation cancelled.\n");
                meshlink_errno = MESHLINK_EPEER;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
        return true;
 
 invalid:
-       logger(mesh, MESHLINK_DEBUG, "Invalid invitation URL or you are already connected to a Mesh ?\n");
+       logger(mesh, MESHLINK_DEBUG, "Invalid invitation URL\n");
        meshlink_errno = MESHLINK_EINVAL;
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
        return false;
 }
 
@@ -1565,12 +2290,16 @@ char *meshlink_export(meshlink_handle_t *mesh) {
                return NULL;
        }
 
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+
        char filename[PATH_MAX];
-       snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->self->name);
+       snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->self->name);
        FILE *f = fopen(filename, "r");
+
        if(!f) {
                logger(mesh, MESHLINK_DEBUG, "Could not open %s: %s\n", filename, strerror(errno));
                meshlink_errno = MESHLINK_ESTORAGE;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return NULL;
        }
 
@@ -1581,15 +2310,20 @@ char *meshlink_export(meshlink_handle_t *mesh) {
        size_t len = fsize + 9 + strlen(mesh->self->name);
        char *buf = xmalloc(len);
        snprintf(buf, len, "Name = %s\n", mesh->self->name);
+
        if(fread(buf + len - fsize - 1, fsize, 1, f) != 1) {
                logger(mesh, MESHLINK_DEBUG, "Error reading from %s: %s\n", filename, strerror(errno));
                fclose(f);
+               free(buf);
                meshlink_errno = MESHLINK_ESTORAGE;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return NULL;
        }
 
        fclose(f);
        buf[len - 1] = 0;
+
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
        return buf;
 }
 
@@ -1599,16 +2333,21 @@ bool meshlink_import(meshlink_handle_t *mesh, const char *data) {
                return false;
        }
 
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+
        if(strncmp(data, "Name = ", 7)) {
                logger(mesh, MESHLINK_DEBUG, "Invalid data\n");
                meshlink_errno = MESHLINK_EPEER;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
        char *end = strchr(data + 7, '\n');
+
        if(!end) {
                logger(mesh, MESHLINK_DEBUG, "Invalid data\n");
                meshlink_errno = MESHLINK_EPEER;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
@@ -1616,30 +2355,37 @@ bool meshlink_import(meshlink_handle_t *mesh, const char *data) {
        char name[len + 1];
        memcpy(name, data + 7, len);
        name[len] = 0;
+
        if(!check_id(name)) {
                logger(mesh, MESHLINK_DEBUG, "Invalid Name\n");
                meshlink_errno = MESHLINK_EPEER;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
        char filename[PATH_MAX];
-       snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+       snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+
        if(!access(filename, F_OK)) {
                logger(mesh, MESHLINK_DEBUG, "File %s already exists, not importing\n", filename);
                meshlink_errno = MESHLINK_EEXIST;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
        if(errno != ENOENT) {
                logger(mesh, MESHLINK_DEBUG, "Error accessing %s: %s\n", filename, strerror(errno));
                meshlink_errno = MESHLINK_ESTORAGE;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
        FILE *f = fopen(filename, "w");
+
        if(!f) {
                logger(mesh, MESHLINK_DEBUG, "Could not create %s: %s\n", filename, strerror(errno));
                meshlink_errno = MESHLINK_ESTORAGE;
+               pthread_mutex_unlock(&(mesh->mesh_mutex));
                return false;
        }
 
@@ -1648,6 +2394,7 @@ bool meshlink_import(meshlink_handle_t *mesh, const char *data) {
 
        load_all_nodes(mesh);
 
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
        return true;
 }
 
@@ -1657,15 +2404,24 @@ void meshlink_blacklist(meshlink_handle_t *mesh, meshlink_node_t *node) {
                return;
        }
 
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+
        node_t *n;
-       n = (node_t*)node;
-       n->status.blacklisted=true;
-       logger(mesh, MESHLINK_DEBUG, "Blacklisted %s.\n",node->name);
+       n = (node_t *)node;
+       n->status.blacklisted = true;
+       logger(mesh, MESHLINK_DEBUG, "Blacklisted %s.\n", node->name);
 
        //Make blacklisting persistent in the config file
        append_config_file(mesh, n->name, "blacklisted", "yes");
 
-       return;
+       //Immediately terminate any connections we have with the blacklisted node
+       for list_each(connection_t, c, mesh->connections) {
+               if(c->node == n) {
+                       terminate_connection(mesh, c, c->status.active);
+               }
+       }
+
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
 }
 
 void meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) {
@@ -1674,49 +2430,344 @@ void meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) {
                return;
        }
 
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+
        node_t *n = (node_t *)node;
        n->status.blacklisted = false;
 
        //TODO: remove blacklisted = yes from the config file
 
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
        return;
 }
 
+void meshlink_set_default_blacklist(meshlink_handle_t *mesh, bool blacklist) {
+       mesh->default_blacklist = blacklist;
+}
+
 /* Hint that a hostname may be found at an address
  * See header file for detailed comment.
  */
-extern void meshlink_hint_address(meshlink_handle_t *mesh, meshlink_node_t *node, const struct sockaddr *addr) {
-       if(!mesh || !node || !addr)
+void meshlink_hint_address(meshlink_handle_t *mesh, meshlink_node_t *node, const struct sockaddr *addr) {
+       if(!mesh || !node || !addr) {
                return;
-       
+       }
+
+       // Ignore hints about ourself.
+       if((node_t *)node == mesh->self) {
+               return;
+       }
+
+       pthread_mutex_lock(&(mesh->mesh_mutex));
+
        char *host = NULL, *port = NULL, *str = NULL;
        sockaddr2str((const sockaddr_t *)addr, &host, &port);
 
        if(host && port) {
                xasprintf(&str, "%s %s", host, port);
-               append_config_file(mesh, node->name, "Address", str);
+
+               if((strncmp("fe80", host, 4) != 0) && (strncmp("127.", host, 4) != 0) && (strcmp("localhost", host) != 0)) {
+                       modify_config_file(mesh, node->name, "Address", str, 5);
+               } else {
+                       logger(mesh, MESHLINK_DEBUG, "Not adding Link Local IPv6 Address to config\n");
+               }
        }
 
        free(str);
        free(host);
        free(port);
 
+       pthread_mutex_unlock(&(mesh->mesh_mutex));
        // @TODO do we want to fire off a connection attempt right away?
 }
 
+static bool channel_pre_accept(struct utcp *utcp, uint16_t port) {
+       (void)port;
+       node_t *n = utcp->priv;
+       meshlink_handle_t *mesh = n->mesh;
+       return mesh->channel_accept_cb;
+}
+
+static ssize_t channel_recv(struct utcp_connection *connection, const void *data, size_t len) {
+       meshlink_channel_t *channel = connection->priv;
+
+       if(!channel) {
+               abort();
+       }
+
+       node_t *n = channel->node;
+       meshlink_handle_t *mesh = n->mesh;
+
+       if(n->status.destroyed) {
+               meshlink_channel_close(mesh, channel);
+       } else if(channel->receive_cb) {
+               channel->receive_cb(mesh, channel, data, len);
+       }
+
+       return len;
+}
+
+static void channel_accept(struct utcp_connection *utcp_connection, uint16_t port) {
+       node_t *n = utcp_connection->utcp->priv;
+
+       if(!n) {
+               abort();
+       }
+
+       meshlink_handle_t *mesh = n->mesh;
+
+       if(!mesh->channel_accept_cb) {
+               return;
+       }
+
+       meshlink_channel_t *channel = xzalloc(sizeof(*channel));
+       channel->node = n;
+       channel->c = utcp_connection;
+
+       if(mesh->channel_accept_cb(mesh, channel, port, NULL, 0)) {
+               utcp_accept(utcp_connection, channel_recv, channel);
+       } else {
+               free(channel);
+       }
+}
+
+static ssize_t channel_send(struct utcp *utcp, const void *data, size_t len) {
+       node_t *n = utcp->priv;
+
+       if(n->status.destroyed) {
+               return -1;
+       }
+
+       meshlink_handle_t *mesh = n->mesh;
+       return meshlink_send(mesh, (meshlink_node_t *)n, data, len) ? (ssize_t)len : -1;
+}
+
+void meshlink_set_channel_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, meshlink_channel_receive_cb_t cb) {
+       if(!mesh || !channel) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return;
+       }
+
+       channel->receive_cb = cb;
+}
+
+static void channel_receive(meshlink_handle_t *mesh, meshlink_node_t *source, const void *data, size_t len) {
+       (void)mesh;
+       node_t *n = (node_t *)source;
+
+       if(!n->utcp) {
+               abort();
+       }
+
+       utcp_recv(n->utcp, data, len);
+}
+
+static void channel_poll(struct utcp_connection *connection, size_t len) {
+       meshlink_channel_t *channel = connection->priv;
+
+       if(!channel) {
+               abort();
+       }
+
+       node_t *n = channel->node;
+       meshlink_handle_t *mesh = n->mesh;
+
+       if(channel->poll_cb) {
+               channel->poll_cb(mesh, channel, len);
+       }
+}
+
+void meshlink_set_channel_poll_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, meshlink_channel_poll_cb_t cb) {
+       (void)mesh;
+       channel->poll_cb = cb;
+       utcp_set_poll_cb(channel->c, cb ? channel_poll : NULL);
+}
+
+void meshlink_set_channel_accept_cb(meshlink_handle_t *mesh, meshlink_channel_accept_cb_t cb) {
+       if(!mesh) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return;
+       }
+
+       pthread_mutex_lock(&mesh->mesh_mutex);
+       mesh->channel_accept_cb = cb;
+       mesh->receive_cb = channel_receive;
+
+       for splay_each(node_t, n, mesh->nodes) {
+               if(!n->utcp && n != mesh->self) {
+                       n->utcp = utcp_init(channel_accept, channel_pre_accept, channel_send, n);
+               }
+       }
+
+       pthread_mutex_unlock(&mesh->mesh_mutex);
+}
+
+meshlink_channel_t *meshlink_channel_open_ex(meshlink_handle_t *mesh, meshlink_node_t *node, uint16_t port, meshlink_channel_receive_cb_t cb, const void *data, size_t len, uint32_t flags) {
+       if(data || len) {
+               abort();        // TODO: handle non-NULL data
+       }
+
+       if(!mesh || !node) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return NULL;
+       }
+
+       node_t *n = (node_t *)node;
+
+       if(!n->utcp) {
+               n->utcp = utcp_init(channel_accept, channel_pre_accept, channel_send, n);
+               mesh->receive_cb = channel_receive;
+
+               if(!n->utcp) {
+                       meshlink_errno = errno == ENOMEM ? MESHLINK_ENOMEM : MESHLINK_EINTERNAL;
+                       return NULL;
+               }
+       }
+
+       meshlink_channel_t *channel = xzalloc(sizeof(*channel));
+       channel->node = n;
+       channel->receive_cb = cb;
+       channel->c = utcp_connect_ex(n->utcp, port, channel_recv, channel, flags);
+
+       if(!channel->c) {
+               meshlink_errno = errno == ENOMEM ? MESHLINK_ENOMEM : MESHLINK_EINTERNAL;
+               free(channel);
+               return NULL;
+       }
+
+       return channel;
+}
+
+meshlink_channel_t *meshlink_channel_open(meshlink_handle_t *mesh, meshlink_node_t *node, uint16_t port, meshlink_channel_receive_cb_t cb, const void *data, size_t len) {
+       return meshlink_channel_open_ex(mesh, node, port, cb, data, len, MESHLINK_CHANNEL_TCP);
+}
+
+void meshlink_channel_shutdown(meshlink_handle_t *mesh, meshlink_channel_t *channel, int direction) {
+       if(!mesh || !channel) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return;
+       }
+
+       utcp_shutdown(channel->c, direction);
+}
+
+void meshlink_channel_close(meshlink_handle_t *mesh, meshlink_channel_t *channel) {
+       if(!mesh || !channel) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return;
+       }
+
+       utcp_close(channel->c);
+       free(channel);
+}
+
+ssize_t meshlink_channel_send(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
+       if(!mesh || !channel) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return -1;
+       }
+
+       if(!len) {
+               return 0;
+       }
+
+       if(!data) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return -1;
+       }
+
+       // TODO: more finegrained locking.
+       // Ideally we want to put the data into the UTCP connection's send buffer.
+       // Then, preferrably only if there is room in the receiver window,
+       // kick the meshlink thread to go send packets.
+
+       pthread_mutex_lock(&mesh->mesh_mutex);
+       ssize_t retval = utcp_send(channel->c, data, len);
+       pthread_mutex_unlock(&mesh->mesh_mutex);
+
+       if(retval < 0) {
+               meshlink_errno = MESHLINK_ENETWORK;
+       }
+
+       return retval;
+}
+
+uint32_t meshlink_channel_get_flags(meshlink_handle_t *mesh, meshlink_channel_t *channel) {
+       if(!mesh || !channel) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return -1;
+       }
+
+       return channel->c->flags;
+}
+
+void update_node_status(meshlink_handle_t *mesh, node_t *n) {
+       if(n->status.reachable && mesh->channel_accept_cb && !n->utcp) {
+               n->utcp = utcp_init(channel_accept, channel_pre_accept, channel_send, n);
+       }
+
+       if(mesh->node_status_cb) {
+               mesh->node_status_cb(mesh, (meshlink_node_t *)n, n->status.reachable);
+       }
+}
+
+void handle_duplicate_node(meshlink_handle_t *mesh, node_t *n) {
+       if(!mesh->node_duplicate_cb || n->status.duplicate) {
+               return;
+       }
+
+       n->status.duplicate = true;
+       mesh->node_duplicate_cb(mesh, (meshlink_node_t *)n);
+}
+
+void meshlink_enable_discovery(meshlink_handle_t *mesh, bool enable) {
+#if HAVE_CATTA
+
+       if(!mesh) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return;
+       }
+
+       pthread_mutex_lock(&mesh->mesh_mutex);
+
+       if(mesh->discovery == enable) {
+               goto end;
+       }
+
+       if(mesh->threadstarted) {
+               if(enable) {
+                       discovery_start(mesh);
+               } else {
+                       discovery_stop(mesh);
+               }
+       }
+
+       mesh->discovery = enable;
+
+end:
+       pthread_mutex_unlock(&mesh->mesh_mutex);
+#else
+       (void)mesh;
+       (void)enable;
+       meshlink_errno = MESHLINK_ENOTSUP;
+#endif
+}
+
 static void __attribute__((constructor)) meshlink_init(void) {
        crypto_init();
+       unsigned int seed;
+       randomize(&seed, sizeof(seed));
+       srand(seed);
 }
 
 static void __attribute__((destructor)) meshlink_exit(void) {
        crypto_exit();
 }
 
-
 /// Device class traits
-dev_class_traits_t dev_class_traits[_DEV_CLASS_MAX +1] = {
-       { .min_connects = 3, .max_connects = 10000, .edge_weight = 1 }, // DEV_CLASS_BACKBONE
-       { .min_connects = 3, .max_connects = 100, .edge_weight = 3 },   // DEV_CLASS_STATIONARY
-       { .min_connects = 3, .max_connects = 3, .edge_weight = 6 },             // DEV_CLASS_PORTABLE
-       { .min_connects = 1, .max_connects = 1, .edge_weight = 9 },             // DEV_CLASS_UNKNOWN
+dev_class_traits_t dev_class_traits[_DEV_CLASS_MAX + 1] = {
+       { .min_connects = 3, .max_connects = 10000, .edge_weight = 1 }, // DEV_CLASS_BACKBONE
+       { .min_connects = 3, .max_connects = 100, .edge_weight = 3 },   // DEV_CLASS_STATIONARY
+       { .min_connects = 3, .max_connects = 3, .edge_weight = 6 },             // DEV_CLASS_PORTABLE
+       { .min_connects = 1, .max_connects = 1, .edge_weight = 9 },             // DEV_CLASS_UNKNOWN
 };