X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fmeshlink.c;h=302624fc5d0944cdd53934bd272a11d942ee8d65;hp=bd74b1d8d358ba93ee6afbbb42c7e1df4b5f9d39;hb=98d0eb964413f6cc655640f207dde4bf5f1ce89d;hpb=ac24ceb9a5976628dd4ac31b2b502f1caac2b2ec diff --git a/src/meshlink.c b/src/meshlink.c index bd74b1d8..302624fc 100644 --- a/src/meshlink.c +++ b/src/meshlink.c @@ -1,6 +1,6 @@ /* meshlink.c -- Implementation of the MeshLink API. - Copyright (C) 2014 Guus Sliepen + Copyright (C) 2014-2018 Guus Sliepen 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 @@ -16,17 +16,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define VAR_SERVER 1 /* Should be in meshlink.conf */ -#define VAR_HOST 2 /* Can be in host config file */ -#define VAR_MULTIPLE 4 /* Multiple statements allowed */ -#define VAR_OBSOLETE 8 /* Should not be used anymore */ -#define VAR_SAFE 16 /* Variable is safe when accepting invitations */ -#define MAX_ADDRESS_LENGTH 45 /* Max length of an (IPv6) address */ -#define MAX_PORT_LENGTH 5 /* 0-65535 */ -typedef struct { - const char *name; - int type; -} var_t; #include "system.h" #include @@ -37,285 +26,454 @@ typedef struct { #include "meshlink_internal.h" #include "netutl.h" #include "node.h" +#include "submesh.h" +#include "packmsg.h" +#include "prf.h" #include "protocol.h" #include "route.h" +#include "sockaddr.h" #include "utils.h" #include "xalloc.h" #include "ed25519/sha512.h" #include "discovery.h" +#include "devtools.h" #ifndef MSG_NOSIGNAL #define MSG_NOSIGNAL 0 #endif - __thread meshlink_errno_t meshlink_errno; meshlink_log_cb_t global_log_cb; 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 */ - {"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; - } - - char buf[1024]; - size_t len; - while((len = fread(buf, 1, sizeof buf, in))) - fwrite(buf, len, 1, out); - fclose(in); - return true; -} +typedef bool (*search_node_by_condition_t)(const node_t *, const void *); 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)) +static void get_canonical_address(node_t *n, char **hostname, char **port) { + if(!n->canonical_address) { return; + } - FILE *f = fopen(filename, "r"); - if(!f) - return; + *hostname = xstrdup(n->canonical_address); + char *space = strchr(*hostname, ' '); - while(fgets(line, sizeof line, f)) { - if(!rstrip(line)) - continue; - char *p = line, *q; - p += strcspn(p, "\t ="); - if(!*p) - continue; - q = p + strspn(p, "\t "); - if(*q == '=') - q += 1 + strspn(q + 1, "\t "); - *p = 0; - p = q + strcspn(q, "\t "); - if(*p) - *p++ = 0; - p += strspn(p, "\t "); - p[strcspn(p, "\t ")] = 0; - - if(!*port && !strcasecmp(line, "Port")) { - *port = xstrdup(q); - } else if(!*hostname && !strcasecmp(line, "Address")) { - *hostname = xstrdup(q); - if(*p) { - free(*port); - *port = xstrdup(p); - } + if(space) { + *space++ = 0; + *port = xstrdup(space); + } +} + +static bool is_valid_hostname(const char *hostname) { + if(!*hostname) { + return false; + } + + for(const char *p = hostname; *p; p++) { + if(!(isalnum(*p) || *p == '-' || *p == '.' || *p == ':')) { + return false; } + } - if(*hostname && *port) - break; + 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; + } } - fclose(f); + return true; } -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 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)); +} - if(hostname) - goto done; +struct socket_in_netns_params { + int domain; + int type; + int protocol; + int netns; + int fd; +}; + +#ifdef HAVE_SETNS +static void *socket_in_netns_thread(void *arg) { + struct socket_in_netns_params *params = arg; + + if(setns(params->netns, CLONE_NEWNET) == -1) { + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + params->fd = socket(params->domain, params->type, params->protocol); + + return NULL; +} +#endif // HAVE_SETNS + +static int socket_in_netns(int domain, int type, int protocol, int netns) { + if(netns == -1) { + return socket(domain, type, protocol); + } + +#ifdef HAVE_SETNS + struct socket_in_netns_params params = {domain, type, protocol, netns, -1}; + + pthread_t thr; + + if(pthread_create(&thr, NULL, socket_in_netns_thread, ¶ms) == 0) { + pthread_join(thr, NULL); + } + + return params.fd; +#else + return -1; +#endif // HAVE_SETNS + +} + +// 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 getlocaladdr(char *destaddr, struct sockaddr *sn, socklen_t *sl, int netns) { + 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_in_netns(rai->ai_family, rai->ai_socktype, rai->ai_protocol, netns); + + if(sock == -1) { + freeaddrinfo(rai); + return false; + } + + if(connect(sock, rai->ai_addr, rai->ai_addrlen) && !sockwouldblock(errno)) { + closesocket(sock); + freeaddrinfo(rai); + return false; + } + + freeaddrinfo(rai); + + if(getsockname(sock, sn, sl)) { + closesocket(sock); + return false; + } + + closesocket(sock); + return true; +} + +static bool getlocaladdrname(char *destaddr, char *host, socklen_t hostlen, int netns) { + struct sockaddr_storage sn; + socklen_t sl = sizeof(sn); + + if(!getlocaladdr(destaddr, (struct sockaddr *)&sn, &sl, netns)) { + 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; + } + + int s = socket_in_netns(aip->ai_family, aip->ai_socktype, aip->ai_protocol, mesh->netns); - 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 == ':') + if(hostname && !is_valid_hostname(hostname)) { + free(hostname); + hostname = NULL; + } + + if(!hostname) { + meshlink_errno = MESHLINK_ERESOLV; + } + + return hostname; +} + +char *meshlink_get_local_address_for_family(meshlink_handle_t *mesh, int family) { + (void)mesh; + + // Determine address of the local interface used for outgoing connections. + char localaddr[NI_MAXHOST]; + bool success = false; + + if(family == AF_INET) { + success = getlocaladdrname("93.184.216.34", localaddr, sizeof(localaddr), mesh->netns); + } else if(family == AF_INET6) { + success = getlocaladdrname("2606:2800:220:1:248:1893:25c8:1946", localaddr, sizeof(localaddr), mesh->netns); + } + + if(!success) { + meshlink_errno = MESHLINK_ENETWORK; + return NULL; + } + + return xstrdup(localaddr); +} + +void remove_duplicate_hostnames(char *host[], char *port[], int n) { + for(int i = 0; i < n; i++) { + if(!host[i]) { + continue; + } + + // Ignore duplicate hostnames + bool found = false; + + for(int j = 0; j < i; j++) { + if(!host[j]) { + continue; + } + + if(strcmp(host[i], host[j])) { + continue; + } + + if(strcmp(port[i], port[j])) { continue; - // If not, forget it. - free(hostname); - hostname = NULL; + } + + found = true; break; } + + if(found) { + free(host[i]); + free(port[i]); + host[i] = NULL; + port[i] = NULL; + continue; + } } +} - if(!hostname) - return NULL; +// This gets the hostname part for use in invitation URLs +static char *get_my_hostname(meshlink_handle_t *mesh, uint32_t flags) { + char *hostname[4] = {NULL}; + char *port[4] = {NULL}; + char *hostport = NULL; - 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(!(flags & (MESHLINK_INVITE_LOCAL | MESHLINK_INVITE_PUBLIC))) { + flags |= MESHLINK_INVITE_LOCAL | MESHLINK_INVITE_PUBLIC; } -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(!(flags & (MESHLINK_INVITE_IPV4 | MESHLINK_INVITE_IPV6))) { + flags |= MESHLINK_INVITE_IPV4 | MESHLINK_INVITE_IPV6; } - free(hostname); - free(port); - return hostport; -} + // Add local addresses if requested + if(flags & MESHLINK_INVITE_LOCAL) { + if(flags & MESHLINK_INVITE_IPV4) { + hostname[0] = meshlink_get_local_address_for_family(mesh, AF_INET); + } -static char *get_line(const char **data) { - if(!data || !*data) - return NULL; + if(flags & MESHLINK_INVITE_IPV6) { + hostname[1] = meshlink_get_local_address_for_family(mesh, AF_INET6); + } + } - if(!**data) { - *data = NULL; - return NULL; + // Add public/canonical addresses if requested + if(flags & MESHLINK_INVITE_PUBLIC) { + // Try the CanonicalAddress first + get_canonical_address(mesh->self, &hostname[2], &port[2]); + + if(!hostname[2]) { + if(flags & MESHLINK_INVITE_IPV4) { + hostname[2] = meshlink_get_external_address_for_family(mesh, AF_INET); + } + + if(flags & MESHLINK_INVITE_IPV6) { + hostname[3] = meshlink_get_external_address_for_family(mesh, AF_INET6); + } + } } - static char line[1024]; - const char *end = strchr(*data, '\n'); - size_t len = end ? end - *data : strlen(*data); - if(len >= sizeof line) { - logger(NULL, MESHLINK_ERROR, "Maximum line length exceeded!\n"); - return NULL; + for(int i = 0; i < 4; i++) { + // Ensure we always have a port number + if(hostname[i] && !port[i]) { + port[i] = xstrdup(mesh->myport); + } } - if(len && !isprint(**data)) - abort(); - memcpy(line, *data, len); - line[len] = 0; + remove_duplicate_hostnames(hostname, port, 4); - if(end) - *data = end + 1; - else - *data = NULL; + if(!(flags & MESHLINK_INVITE_NUMERIC)) { + for(int i = 0; i < 4; i++) { + if(!hostname[i]) { + continue; + } - return line; -} + // Convert what we have to a sockaddr + struct addrinfo *ai_in, *ai_out; + struct addrinfo hint = { + .ai_family = AF_UNSPEC, + .ai_flags = AI_NUMERICSERV, + .ai_socktype = SOCK_STREAM, + }; + int err = getaddrinfo(hostname[i], port[i], &hint, &ai_in); -static char *get_value(const char *data, const char *var) { - char *line = get_line(&data); - if(!line) - return NULL; + if(err || !ai_in) { + continue; + } - char *sep = line + strcspn(line, " \t="); - char *val = sep + strspn(sep, " \t"); - if(*val == '=') - val += 1 + strspn(val + 1, " \t"); - *sep = 0; - if(strcasecmp(line, var)) - return NULL; - return val; + // Convert it to a hostname + char resolved_host[NI_MAXHOST]; + char resolved_port[NI_MAXSERV]; + err = getnameinfo(ai_in->ai_addr, ai_in->ai_addrlen, resolved_host, sizeof resolved_host, resolved_port, sizeof resolved_port, NI_NUMERICSERV); + + if(err) { + freeaddrinfo(ai_in); + continue; + } + + // Convert the hostname back to a sockaddr + hint.ai_family = ai_in->ai_family; + err = getaddrinfo(resolved_host, resolved_port, &hint, &ai_out); + + if(err || !ai_out) { + freeaddrinfo(ai_in); + continue; + } + + // Check if it's still the same sockaddr + if(ai_in->ai_addrlen != ai_out->ai_addrlen || memcmp(ai_in->ai_addr, ai_out->ai_addr, ai_in->ai_addrlen)) { + freeaddrinfo(ai_in); + freeaddrinfo(ai_out); + continue; + } + + // Yes: replace the hostname with the resolved one + free(hostname[i]); + hostname[i] = xstrdup(resolved_host); + + freeaddrinfo(ai_in); + freeaddrinfo(ai_out); + } + } + + // Remove duplicates again, since IPv4 and IPv6 addresses might map to the same hostname + remove_duplicate_hostnames(hostname, port, 4); + + // Concatenate all unique address to the hostport string + for(int i = 0; i < 4; i++) { + if(!hostname[i]) { + continue; + } + + // Ensure we have the same addresses in our own host config file. + char *tmphostport; + xasprintf(&tmphostport, "%s %s", hostname[i], port[i]); + /// TODO: FIX + //config_add_string(&mesh->config, "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]); + free(hostport); + hostport = newhostport; + + free(hostname[i]); + free(port[i]); + } + + return hostport; } static bool try_bind(int port) { @@ -328,54 +486,98 @@ 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) { + for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) { + int fd = socket(aip->ai_family, SOCK_STREAM, IPPROTO_TCP); - 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); + + int result = bind(fd, aip->ai_addr, aip->ai_addrlen); closesocket(fd); + if(result) { freeaddrinfo(ai); return false; } - ai = ai->ai_next; } freeaddrinfo(ai); 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); - FILE *f = fopen(filename, "a"); - if(!f) { - logger(mesh, MESHLINK_DEBUG, "Please change MeshLink's Port manually.\n"); - return 0; - } - fprintf(f, "Port = %d\n", port); - fclose(f); + if(try_bind(port)) { + free(mesh->myport); + xasprintf(&mesh->myport, "%d", port); return port; } } - 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 bool finalize_join(meshlink_handle_t *mesh) { - char *name = xstrdup(get_value(mesh->data, "Name")); +static bool write_main_config_files(meshlink_handle_t *mesh) { + if(!mesh->confbase) { + return true; + } + + uint8_t buf[4096]; + + /* Write the main config file */ + packmsg_output_t out = {buf, sizeof buf}; + + packmsg_add_uint32(&out, MESHLINK_CONFIG_VERSION); + packmsg_add_str(&out, mesh->name); + packmsg_add_bin(&out, ecdsa_get_private_key(mesh->private_key), 96); + packmsg_add_bin(&out, ecdsa_get_private_key(mesh->invitation_key), 96); + packmsg_add_uint16(&out, atoi(mesh->myport)); + + if(!packmsg_output_ok(&out)) { + return false; + } + + config_t config = {buf, packmsg_output_size(&out, buf)}; + + if(!main_config_write(mesh, "current", &config, mesh->config_key)) { + return false; + } + + /* Write our own host config file */ + if(!node_write_config(mesh, mesh->self)) { + return false; + } + + return true; +} + +static bool finalize_join(meshlink_handle_t *mesh, const void *buf, uint16_t len) { + packmsg_input_t in = {buf, len}; + uint32_t version = packmsg_get_uint32(&in); + + if(version != MESHLINK_INVITATION_VERSION) { + logger(mesh, MESHLINK_ERROR, "Invalid invitation version!\n"); + return false; + } + + char *name = packmsg_get_str_dup(&in); + packmsg_skip_element(&in); /* submesh */ + int32_t devclass = packmsg_get_int32(&in); + uint32_t count = packmsg_get_array(&in); + if(!name) { logger(mesh, MESHLINK_DEBUG, "No Name found in invitation!\n"); return false; @@ -383,210 +585,155 @@ static bool finalize_join(meshlink_handle_t *mesh) { if(!check_id(name)) { logger(mesh, MESHLINK_DEBUG, "Invalid Name found in invitation: %s!\n", name); + free(name); return false; } - char filename[PATH_MAX]; - 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)); + if(!count) { + logger(mesh, MESHLINK_ERROR, "Incomplete invitation file!\n"); + free(name); return false; } - fprintf(f, "Name = %s\n", name); + free(mesh->name); + free(mesh->self->name); + mesh->name = name; + mesh->self->name = xstrdup(name); + mesh->self->devclass = devclass; - 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); + // Initialize configuration directory + if(!config_init(mesh, "current")) { return false; } - // Filter first chunk on approved keywords, split between meshlink.conf and hosts/Name - // Other chunks go unfiltered to their respective host config files - const char *p = mesh->data; - char *l, *value; + if(!write_main_config_files(mesh)) { + return false; + } - while((l = get_line(&p))) { - // Ignore comments - if(*l == '#') - continue; + // Write host config files + while(count--) { + const void *data; + uint32_t len = packmsg_get_bin_raw(&in, &data); - // 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 "); + if(!len) { + logger(mesh, MESHLINK_ERROR, "Incomplete invitation file!\n"); + return false; } - l[len] = 0; - // Is it a Name? - if(!strcasecmp(l, "Name")) - if(strcmp(value, name)) - break; - else - continue; - else if(!strcasecmp(l, "NetName")) - continue; + packmsg_input_t in2 = {data, len}; + uint32_t version = packmsg_get_uint32(&in2); + char *name = packmsg_get_str_dup(&in2); - // Check the list of known variables //TODO: most variables will not be available in meshlink, only name and key will be absolutely necessary - bool found = false; - int i; - for(i = 0; variables[i].name; i++) { - if(strcasecmp(l, variables[i].name)) - continue; - found = true; + if(!packmsg_input_ok(&in2) || version != MESHLINK_CONFIG_VERSION || !check_id(name)) { + free(name); + packmsg_input_invalidate(&in); break; } - // Ignore unknown and unsafe variables - if(!found) { - logger(mesh, MESHLINK_DEBUG, "Ignoring unknown variable '%s' in invitation.\n", l); - continue; - } else if(!(variables[i].type & VAR_SAFE)) { - logger(mesh, MESHLINK_DEBUG, "Ignoring unsafe variable '%s' in invitation.\n", l); - continue; - } - - // Copy the safe variable to the right config file - fprintf(variables[i].type & VAR_HOST ? fh : f, "%s = %s\n", l, value); - } - - fclose(f); - - while(l && !strcasecmp(l, "Name")) { - if(!check_id(value)) { - logger(mesh, MESHLINK_DEBUG, "Invalid Name found in invitation.\n"); - return false; + if(!check_id(name)) { + free(name); + break; } - if(!strcmp(value, name)) { + if(!strcmp(name, mesh->name)) { logger(mesh, MESHLINK_DEBUG, "Secondary chunk would overwrite our own host config file.\n"); + free(name); + meshlink_errno = MESHLINK_EPEER; return false; } - snprintf(filename, sizeof filename, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, value); - f = fopen(filename, "w"); + node_t *n = new_node(); + n->name = name; + + config_t config = {data, len}; - if(!f) { - logger(mesh, MESHLINK_DEBUG, "Could not create file %s: %s\n", filename, strerror(errno)); + if(!node_read_from_config(mesh, n, &config)) { + free_node(n); + logger(mesh, MESHLINK_ERROR, "Invalid host config file in invitation file!\n"); + meshlink_errno = MESHLINK_EPEER; return false; } - while((l = get_line(&p))) { - 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; - } + node_add(mesh, n); - fputs(l, f); - fputc('\n', f); + if(!config_write(mesh, "current", n->name, &config, mesh->config_key)) { + return false; } - - fclose(f); } - char *b64key = ecdsa_get_base64_public_key(mesh->self->connection->ecdsa); - if(!b64key) { - fclose(fh); - return false; - } - - fprintf(fh, "ECDSAPublicKey = %s\n", b64key); - fprintf(fh, "Port = %s\n", mesh->myport); - - fclose(fh); - - sptps_send_record(&(mesh->sptps), 1, b64key, strlen(b64key)); - free(b64key); - - free(mesh->self->name); - free(mesh->self->connection->name); - mesh->self->name = xstrdup(name); - mesh->self->connection->name = name; + sptps_send_record(&(mesh->sptps), 1, ecdsa_get_public_key(mesh->private_key), 32); logger(mesh, MESHLINK_DEBUG, "Configuration stored in: %s\n", mesh->confbase); - load_all_nodes(mesh); - return true; } 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; + 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 SPTPS_HANDSHAKE: + return sptps_send_record(&(mesh->sptps), 0, mesh->cookie, sizeof(mesh)->cookie); - case 1: - mesh->thedatalen = 0; - return finalize_join(mesh); + case 0: + return finalize_join(mesh, msg, len); - case 2: - logger(mesh, MESHLINK_DEBUG, "Invitation succesfully accepted.\n"); - shutdown(mesh->sock, SHUT_RDWR); - mesh->success = true; - break; + case 1: + logger(mesh, MESHLINK_DEBUG, "Invitation succesfully accepted.\n"); + shutdown(mesh->sock, SHUT_RDWR); + mesh->success = true; + break; - default: - return false; + default: + return false; } return true; } -static bool recvline(meshlink_handle_t* mesh, 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; @@ -604,21 +751,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; } @@ -637,123 +788,200 @@ 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]; } static bool ecdsa_keygen(meshlink_handle_t *mesh) { - ecdsa_t *key; - FILE *f; - char pubname[PATH_MAX], privname[PATH_MAX]; + logger(mesh, MESHLINK_DEBUG, "Generating ECDSA keypairs:\n"); - logger(mesh, MESHLINK_DEBUG, "Generating ECDSA keypair:\n"); + mesh->private_key = ecdsa_generate(); + mesh->invitation_key = ecdsa_generate(); - if(!(key = ecdsa_generate())) { + if(!mesh->private_key || !mesh->invitation_key) { logger(mesh, MESHLINK_DEBUG, "Error during key generation!\n"); meshlink_errno = MESHLINK_EINTERNAL; return false; - } else - logger(mesh, MESHLINK_DEBUG, "Done.\n"); + } + + logger(mesh, MESHLINK_DEBUG, "Done.\n"); + + 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) { + struct sockaddr_storage sn; + socklen_t sl = sizeof(sn); - snprintf(privname, sizeof privname, "%s" SLASH "ecdsa_key.priv", mesh->confbase); - f = fopen(privname, "w"); + // IPv4 example.org - if(!f) { + if(getlocaladdr("93.184.216.34", (struct sockaddr *)&sn, &sl, mesh->netns)) { + ((struct sockaddr_in *)&sn)->sin_port = ntohs(atoi(mesh->myport)); + meshlink_hint_address(mesh, (meshlink_node_t *)mesh->self, (struct sockaddr *)&sn); + } + + // IPv6 example.org + + sl = sizeof(sn); + + if(getlocaladdr("2606:2800:220:1:248:1893:25c8:1946", (struct sockaddr *)&sn, &sl, mesh->netns)) { + ((struct sockaddr_in6 *)&sn)->sin6_port = ntohs(atoi(mesh->myport)); + meshlink_hint_address(mesh, (meshlink_node_t *)mesh->self, (struct sockaddr *)&sn); + } +} + +static bool meshlink_setup(meshlink_handle_t *mesh) { + if(!config_init(mesh, "current")) { + logger(mesh, MESHLINK_ERROR, "Could not set up configuration in %s/current: %s\n", mesh->confbase, strerror(errno)); meshlink_errno = MESHLINK_ESTORAGE; return false; } -#ifdef HAVE_FCHMOD - fchmod(fileno(f), 0600); -#endif - - if(!ecdsa_write_pem_private_key(key, f)) { - logger(mesh, MESHLINK_DEBUG, "Error writing private key!\n"); - ecdsa_free(key); - fclose(f); + if(!ecdsa_keygen(mesh)) { meshlink_errno = MESHLINK_EINTERNAL; return false; } - fclose(f); + if(check_port(mesh) == 0) { + meshlink_errno = MESHLINK_ENETWORK; + return false; + } + + /* Create a node for ourself */ - snprintf(pubname, sizeof pubname, "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->name); - f = fopen(pubname, "a"); + mesh->self = new_node(); + mesh->self->name = xstrdup(mesh->name); + mesh->self->devclass = mesh->devclass; + mesh->self->ecdsa = ecdsa_set_public_key(ecdsa_get_public_key(mesh->private_key)); - if(!f) { + if(!write_main_config_files(mesh)) { + logger(mesh, MESHLINK_ERROR, "Could not write main config files into %s/current: %s\n", mesh->confbase, strerror(errno)); meshlink_errno = MESHLINK_ESTORAGE; return false; } - char *pubkey = ecdsa_get_base64_public_key(key); - fprintf(f, "ECDSAPublicKey = %s\n", pubkey); - free(pubkey); - - fclose(f); - ecdsa_free(key); + if(!main_config_lock(mesh)) { + logger(NULL, MESHLINK_ERROR, "Cannot lock main config file\n"); + meshlink_errno = MESHLINK_ESTORAGE; + return false; + } return true; } -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)); +static bool meshlink_read_config(meshlink_handle_t *mesh) { + // Open the configuration file and lock it + if(!main_config_lock(mesh)) { + logger(NULL, MESHLINK_ERROR, "Cannot lock main config file\n"); meshlink_errno = MESHLINK_ESTORAGE; return false; } - char filename[PATH_MAX]; - snprintf(filename, sizeof filename, "%s" SLASH "hosts", mesh->confbase); + config_t config; - if(mkdir(filename, 0777) && errno != EEXIST) { - logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", filename, strerror(errno)); - meshlink_errno = MESHLINK_ESTORAGE; + if(!main_config_read(mesh, "current", &config, mesh->config_key)) { + logger(NULL, MESHLINK_ERROR, "Could not read main configuration file!"); return false; } - snprintf(filename, sizeof filename, "%s" SLASH "meshlink.conf", mesh->confbase); + packmsg_input_t in = {config.buf, config.len}; + const void *private_key; + const void *invitation_key; - if(!access(filename, F_OK)) { - logger(mesh, MESHLINK_DEBUG, "Configuration file %s already exists!\n", filename); - meshlink_errno = MESHLINK_EEXIST; + uint32_t version = packmsg_get_uint32(&in); + char *name = packmsg_get_str_dup(&in); + uint32_t private_key_len = packmsg_get_bin_raw(&in, &private_key); + uint32_t invitation_key_len = packmsg_get_bin_raw(&in, &invitation_key); + uint16_t myport = packmsg_get_uint16(&in); + + if(!packmsg_done(&in) || version != MESHLINK_CONFIG_VERSION || private_key_len != 96 || invitation_key_len != 96) { + logger(NULL, MESHLINK_ERROR, "Error parsing main configuration file!"); + free(name); + config_free(&config); return false; } - FILE *f = fopen(filename, "w"); - if(!f) { - logger(mesh, MESHLINK_DEBUG, "Could not create file %s: %s\n", filename, strerror(errno)); +#if 0 + + // TODO: check this? + if(mesh->name && strcmp(mesh->name, name)) { + logger(NULL, MESHLINK_ERROR, "Configuration is for a different name (%s)!", name); meshlink_errno = MESHLINK_ESTORAGE; + free(name); + config_free(&config); return false; } - fprintf(f, "Name = %s\n", mesh->name); - fclose(f); +#endif - if(!ecdsa_keygen(mesh)) { - meshlink_errno = MESHLINK_EINTERNAL; + free(mesh->name); + mesh->name = name; + xasprintf(&mesh->myport, "%u", myport); + mesh->private_key = ecdsa_set_private_key(private_key); + mesh->invitation_key = ecdsa_set_private_key(invitation_key); + config_free(&config); + + /* Create a node for ourself and read our host configuration file */ + + mesh->self = new_node(); + mesh->self->name = xstrdup(name); + mesh->self->devclass = mesh->devclass; + + if(!node_read_public_key(mesh, mesh->self)) { + logger(NULL, MESHLINK_ERROR, "Could not read our host configuration file!"); + meshlink_errno = MESHLINK_ESTORAGE; + free_node(mesh->self); + mesh->self = NULL; return false; } - check_port(mesh); - 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)); -} +#ifdef HAVE_SETNS +static void *setup_network_in_netns_thread(void *arg) { + meshlink_handle_t *mesh = arg; -meshlink_handle_t *meshlink_open_with_size(const char *confbase, const char *name, const char* appname, dev_class_t devclass, size_t size) { + if(setns(mesh->netns, CLONE_NEWNET) != 0) { + return NULL; + } - // Validate arguments provided by the application - bool usingname = false; - - logger(NULL, MESHLINK_DEBUG, "meshlink_open called\n"); + bool success = setup_network(mesh); + add_local_addresses(mesh); + return success ? arg : NULL; +} +#endif // HAVE_SETNS +meshlink_open_params_t *meshlink_open_params_init(const char *confbase, const char *name, const char *appname, dev_class_t devclass) { if(!confbase || !*confbase) { logger(NULL, MESHLINK_ERROR, "No confbase given!\n"); meshlink_errno = MESHLINK_EINVAL; @@ -766,95 +994,402 @@ 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 + if(!check_id(name)) { + logger(NULL, MESHLINK_ERROR, "Invalid name given!\n"); + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } } - else { //check name only if there is a name != NULL - if(!check_id(name)) { + if((int)devclass < 0 || devclass > _DEV_CLASS_MAX) { + logger(NULL, MESHLINK_ERROR, "Invalid devclass given!\n"); + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + meshlink_open_params_t *params = xzalloc(sizeof * params); + + params->confbase = xstrdup(confbase); + params->name = xstrdup(name); + params->appname = xstrdup(appname); + params->devclass = devclass; + params->netns = -1; + + return params; +} + +bool meshlink_open_params_set_netns(meshlink_open_params_t *params, int netns) { + if(!params) { + meshlink_errno = MESHLINK_EINVAL; + return false; + } + + params->netns = netns; + + return true; +} + +bool meshlink_open_params_set_storage_key(meshlink_open_params_t *params, const void *key, size_t keylen) { + if(!params) { + meshlink_errno = MESHLINK_EINVAL; + return false; + } + + if((!key && keylen) || (key && !keylen)) { + logger(NULL, MESHLINK_ERROR, "Invalid key length!\n"); + meshlink_errno = MESHLINK_EINVAL; + return false; + } + + params->key = key; + params->keylen = keylen; + + return true; +} + +bool meshlink_encrypted_key_rotate(meshlink_handle_t *mesh, const void *new_key, size_t new_keylen) { + if(!mesh || !new_key || !new_keylen) { + logger(mesh, MESHLINK_ERROR, "Invalid arguments given!\n"); + meshlink_errno = MESHLINK_EINVAL; + return false; + } + + pthread_mutex_lock(&(mesh->mesh_mutex)); + + // Create hash for the new key + void *new_config_key; + new_config_key = xmalloc(CHACHA_POLY1305_KEYLEN); + + if(!prf(new_key, new_keylen, "MeshLink configuration key", 26, new_config_key, CHACHA_POLY1305_KEYLEN)) { + logger(mesh, MESHLINK_ERROR, "Error creating new configuration key!\n"); + meshlink_errno = MESHLINK_EINTERNAL; + pthread_mutex_unlock(&(mesh->mesh_mutex)); + return false; + } + + // Copy contents of the "current" confbase sub-directory to "new" confbase sub-directory with the new key + + if(!config_copy(mesh, "current", mesh->config_key, "new", new_config_key)) { + logger(mesh, MESHLINK_ERROR, "Could not set up configuration in %s/old: %s\n", mesh->confbase, strerror(errno)); + meshlink_errno = MESHLINK_ESTORAGE; + pthread_mutex_unlock(&(mesh->mesh_mutex)); + return false; + } + + devtool_keyrotate_probe(1); + + main_config_unlock(mesh); + + // Rename confbase/current/ to confbase/old + + if(!config_rename(mesh, "current", "old")) { + logger(mesh, MESHLINK_ERROR, "Cannot rename %s/current to %s/old\n", mesh->confbase, mesh->confbase); + meshlink_errno = MESHLINK_ESTORAGE; + main_config_lock(mesh); + pthread_mutex_unlock(&(mesh->mesh_mutex)); + return false; + } + + devtool_keyrotate_probe(2); + + // Rename confbase/new/ to confbase/current + + if(!config_rename(mesh, "new", "current")) { + logger(mesh, MESHLINK_ERROR, "Cannot rename %s/new to %s/current\n", mesh->confbase, mesh->confbase); + meshlink_errno = MESHLINK_ESTORAGE; + main_config_lock(mesh); + pthread_mutex_unlock(&(mesh->mesh_mutex)); + return false; + } + + devtool_keyrotate_probe(3); + + if(!main_config_lock(mesh)) { + pthread_mutex_unlock(&(mesh->mesh_mutex)); + return false; + } + + // Cleanup the "old" confbase sub-directory + + if(!config_destroy(mesh->confbase, "old")) { + pthread_mutex_unlock(&(mesh->mesh_mutex)); + return false; + } + + // Change the mesh handle key with new key + + free(mesh->config_key); + mesh->config_key = new_config_key; + + pthread_mutex_unlock(&(mesh->mesh_mutex)); + + return true; +} + +void meshlink_open_params_free(meshlink_open_params_t *params) { + if(!params) { + meshlink_errno = MESHLINK_EINVAL; + return; + } + + free(params->confbase); + free(params->name); + free(params->appname); + + free(params); +} + +meshlink_handle_t *meshlink_open(const char *confbase, const char *name, const char *appname, dev_class_t devclass) { + if(!confbase || !*confbase) { + logger(NULL, MESHLINK_ERROR, "No confbase given!\n"); + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + /* Create a temporary struct on the stack, to avoid allocating and freeing one. */ + meshlink_open_params_t params; + memset(¶ms, 0, sizeof(params)); + + params.confbase = (char *)confbase; + params.name = (char *)name; + params.appname = (char *)appname; + params.devclass = devclass; + params.netns = -1; + + return meshlink_open_ex(¶ms); +} + +meshlink_handle_t *meshlink_open_encrypted(const char *confbase, const char *name, const char *appname, dev_class_t devclass, const void *key, size_t keylen) { + if(!confbase || !*confbase) { + logger(NULL, MESHLINK_ERROR, "No confbase given!\n"); + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + /* Create a temporary struct on the stack, to avoid allocating and freeing one. */ + meshlink_open_params_t params = {NULL}; + + params.confbase = (char *)confbase; + params.name = (char *)name; + params.appname = (char *)appname; + params.devclass = devclass; + params.netns = -1; + + if(!meshlink_open_params_set_storage_key(¶ms, key, keylen)) { + return false; + } + + return meshlink_open_ex(¶ms); +} + +meshlink_handle_t *meshlink_open_ephemeral(const char *name, const char *appname, dev_class_t devclass) { + /* Create a temporary struct on the stack, to avoid allocating and freeing one. */ + meshlink_open_params_t params = {NULL}; + + params.name = (char *)name; + params.appname = (char *)appname; + params.devclass = devclass; + params.netns = -1; + + return meshlink_open_ex(¶ms); +} + +meshlink_handle_t *meshlink_open_ex(const meshlink_open_params_t *params) { + // Validate arguments provided by the application + bool usingname = false; + + logger(NULL, MESHLINK_DEBUG, "meshlink_open called\n"); + + if(!params->appname || !*params->appname) { + logger(NULL, MESHLINK_ERROR, "No appname given!\n"); + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + if(strchr(params->appname, ' ')) { + logger(NULL, MESHLINK_ERROR, "Invalid appname given!\n"); + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + if(!params->name || !*params->name) { + logger(NULL, MESHLINK_ERROR, "No name given!\n"); + //return NULL; + } else { //check name only if there is a name != NULL + + if(!check_id(params->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)params->devclass < 0 || params->devclass > _DEV_CLASS_MAX) { logger(NULL, MESHLINK_ERROR, "Invalid devclass given!\n"); meshlink_errno = MESHLINK_EINVAL; return NULL; } - meshlink_handle_t *mesh = xzalloc(size); - mesh->confbase = xstrdup(confbase); - mesh->appname = xstrdup(appname); - mesh->devclass = devclass; - if (usingname) mesh->name = xstrdup(name); + if((params->key && !params->keylen) || (!params->key && params->keylen)) { + logger(NULL, MESHLINK_ERROR, "Invalid key length!\n"); + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + meshlink_handle_t *mesh = xzalloc(sizeof(meshlink_handle_t)); + + if(params->confbase) { + mesh->confbase = xstrdup(params->confbase); + } + + mesh->appname = xstrdup(params->appname); + mesh->devclass = params->devclass; + mesh->discovery = true; + mesh->invitation_timeout = 604800; // 1 week + mesh->netns = params->netns; + mesh->submeshes = NULL; + + if(usingname) { + mesh->name = xstrdup(params->name); + } + + // Hash the key + if(params->key) { + mesh->config_key = xmalloc(CHACHA_POLY1305_KEYLEN); + + if(!prf(params->key, params->keylen, "MeshLink configuration key", 26, mesh->config_key, CHACHA_POLY1305_KEYLEN)) { + logger(NULL, MESHLINK_ERROR, "Error creating configuration key!\n"); + meshlink_close(mesh); + meshlink_errno = MESHLINK_EINTERNAL; + return NULL; + } + } // 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; - // Check whether meshlink.conf already exists + meshlink_queue_init(&mesh->outpacketqueue); - char filename[PATH_MAX]; - snprintf(filename, sizeof filename, "%s" SLASH "meshlink.conf", confbase); + // If no configuration exists yet, create it. - if(access(filename, R_OK)) { - if(errno == ENOENT) { - // If not, create it - if(!meshlink_setup(mesh)) { - // meshlink_errno is set by meshlink_setup() - return NULL; - } - } else { - logger(NULL, MESHLINK_ERROR, "Cannot not read from %s: %s\n", filename, strerror(errno)); + if(!meshlink_confbase_exists(mesh)) { + if(!meshlink_setup(mesh)) { + logger(NULL, MESHLINK_ERROR, "Cannot create initial configuration\n"); + meshlink_close(mesh); + return NULL; + } + } else { + if(!meshlink_read_config(mesh)) { + logger(NULL, MESHLINK_ERROR, "Cannot read main configuration\n"); meshlink_close(mesh); - meshlink_errno = MESHLINK_ESTORAGE; return NULL; } } - // Read the configuration - - init_configuration(&mesh->config); - - if(!read_server_config(mesh)) { - meshlink_close(mesh); - meshlink_errno = MESHLINK_ESTORAGE; - return NULL; - }; - #ifdef HAVE_MINGW struct WSAData wsa_state; WSAStartup(MAKEWORD(2, 2), &wsa_state); #endif - // Setup up everything - // TODO: we should not open listening sockets yet + // Setup up everything + // TODO: we should not open listening sockets yet + + bool success = false; + + if(mesh->netns != -1) { +#ifdef HAVE_SETNS + pthread_t thr; + + if(pthread_create(&thr, NULL, setup_network_in_netns_thread, mesh) == 0) { + void *retval = NULL; + success = pthread_join(thr, &retval) == 0 && retval; + } + +#else + meshlink_errno = MESHLINK_EINTERNAL; + return NULL; + +#endif // HAVE_SETNS + } else { + success = setup_network(mesh); + add_local_addresses(mesh); + } - if(!setup_network(mesh)) { + if(!success) { meshlink_close(mesh); meshlink_errno = MESHLINK_ENETWORK; return NULL; } + add_local_addresses(mesh); + node_write_config(mesh, mesh->self); + + idle_set(&mesh->loop, idle, mesh); + logger(NULL, MESHLINK_DEBUG, "meshlink_open returning\n"); return mesh; } +meshlink_submesh_t *meshlink_submesh_open(meshlink_handle_t *mesh, const char *submesh) { + meshlink_submesh_t *s = NULL; + + if(!mesh) { + logger(NULL, MESHLINK_ERROR, "No mesh handle given!\n"); + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + if(!submesh || !*submesh) { + logger(NULL, MESHLINK_ERROR, "No submesh name given!\n"); + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + //lock mesh->nodes + pthread_mutex_lock(&(mesh->mesh_mutex)); + + s = (meshlink_submesh_t *)create_submesh(mesh, submesh); + + pthread_mutex_unlock(&(mesh->mesh_mutex)); + + return s; +} + static void *meshlink_main_loop(void *arg) { meshlink_handle_t *mesh = arg; - pthread_mutex_lock(&(mesh->mesh_mutex)); + if(mesh->netns != -1) { +#ifdef HAVE_SETNS + + if(setns(mesh->netns, CLONE_NEWNET) != 0) { + return NULL; + } + +#else + return NULL; +#endif // HAVE_SETNS + } - try_outgoing_connections(mesh); + pthread_mutex_lock(&(mesh->mesh_mutex)); logger(mesh, MESHLINK_DEBUG, "Starting main_loop...\n"); main_loop(mesh); @@ -865,39 +1400,70 @@ static void *meshlink_main_loop(void *arg) { } bool meshlink_start(meshlink_handle_t *mesh) { + assert(mesh->self); + assert(mesh->private_key); + if(!mesh) { meshlink_errno = MESHLINK_EINVAL; return false; } - pthread_mutex_lock(&(mesh->mesh_mutex)); - + logger(mesh, MESHLINK_DEBUG, "meshlink_start called\n"); + 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; } + init_outgoings(mesh); + // 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; + +#if HAVE_CATTA + + if(mesh->discovery) { + discovery_start(mesh); + } + +#endif + + assert(mesh->self->ecdsa); + assert(!memcmp((uint8_t *)mesh->self->ecdsa + 64, (uint8_t *)mesh->private_key + 64, 32)); - discovery_start(mesh); pthread_mutex_unlock(&(mesh->mesh_mutex)); return true; @@ -912,40 +1478,76 @@ void meshlink_stop(meshlink_handle_t *mesh) { 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 - pthread_mutex_unlock(&(mesh->mesh_mutex)); - pthread_join(mesh->thread, NULL); - pthread_mutex_lock(&(mesh->mesh_mutex)); + // 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); - 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; + } + + 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); + } + } + + exit_outgoings(mesh); + + // Write out any changed node config files + if(mesh->nodes) { + for splay_each(node_t, n, mesh->nodes) { + if(n->status.dirty) { + node_write_config(mesh, n); + n->status.dirty = false; + } + } + } - // 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); - pthread_mutex_unlock(&(mesh->mesh_mutex)); } void meshlink_close(meshlink_handle_t *mesh) { - if(!mesh || !mesh->confbase) { + if(!mesh) { meshlink_errno = MESHLINK_EINVAL; 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)); @@ -955,26 +1557,59 @@ void meshlink_close(meshlink_handle_t *mesh) { logger(mesh, MESHLINK_INFO, "Terminating"); - exit_configuration(&mesh->config); event_loop_exit(&mesh->loop); #ifdef HAVE_MINGW - if(mesh->confbase) + + if(mesh->confbase) { WSACleanup(); + } + #endif ecdsa_free(mesh->invitation_key); + if(mesh->netns != -1) { + close(mesh->netns); + } + free(mesh->name); free(mesh->appname); free(mesh->confbase); + free(mesh->config_key); + ecdsa_free(mesh->private_key); pthread_mutex_destroy(&(mesh->mesh_mutex)); - memset(mesh, 0, sizeof *mesh); + main_config_unlock(mesh); + + memset(mesh, 0, sizeof(*mesh)); free(mesh); } +bool meshlink_destroy(const char *confbase) { + if(!confbase) { + meshlink_errno = MESHLINK_EINVAL; + return false; + } + + if(!config_destroy(confbase, "current")) { + logger(NULL, MESHLINK_ERROR, "Cannot remove confbase sub-directories %s: %s\n", confbase, strerror(errno)); + return false; + } + + config_destroy(confbase, "new"); + config_destroy(confbase, "old"); + + if(rmdir(confbase) && errno != ENOENT) { + logger(NULL, MESHLINK_ERROR, "Cannot remove directory %s: %s\n", confbase, strerror(errno)); + meshlink_errno = MESHLINK_ESTORAGE; + return false; + } + + return true; +} + void meshlink_set_receive_cb(meshlink_handle_t *mesh, meshlink_receive_cb_t cb) { if(!mesh) { meshlink_errno = MESHLINK_EINVAL; @@ -986,6 +1621,17 @@ void meshlink_set_receive_cb(meshlink_handle_t *mesh, meshlink_receive_cb_t cb) pthread_mutex_unlock(&(mesh->mesh_mutex)); } +void meshlink_set_connection_try_cb(meshlink_handle_t *mesh, meshlink_connection_try_cb_t cb) { + if(!mesh) { + meshlink_errno = MESHLINK_EINVAL; + return; + } + + pthread_mutex_lock(&(mesh->mesh_mutex)); + mesh->connection_try_cb = cb; + pthread_mutex_unlock(&(mesh->mesh_mutex)); +} + void meshlink_set_node_status_cb(meshlink_handle_t *mesh, meshlink_node_status_cb_t cb) { if(!mesh) { meshlink_errno = MESHLINK_EINVAL; @@ -997,6 +1643,17 @@ void meshlink_set_node_status_cb(meshlink_handle_t *mesh, meshlink_node_status_c 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)); @@ -1013,21 +1670,30 @@ bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const meshlink_packethdr_t *hdr; // Validate arguments - if(!mesh || !destination || len >= MAXSIZE - sizeof *hdr) { + 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; } + node_t *n = (node_t *)destination; + + if(n->status.blacklisted) { + logger(mesh, MESHLINK_ERROR, "Node %s blacklisted, dropping packet\n", n->name); + return false; + } + // Prepare the packet - vpn_packet_t *packet = malloc(sizeof *packet); + vpn_packet_t *packet = malloc(sizeof(*packet)); + if(!packet) { meshlink_errno = MESHLINK_ENOMEM; return false; @@ -1035,14 +1701,16 @@ bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const packet->probe = false; packet->tcp = false; - packet->len = len + sizeof *hdr; + packet->len = len + sizeof(*hdr); hdr = (meshlink_packethdr_t *)packet->data; - memset(hdr, 0, sizeof *hdr); - memcpy(hdr->destination, destination->name, sizeof hdr->destination); - memcpy(hdr->source, mesh->self->name, sizeof hdr->source); + 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); - memcpy(packet->data + sizeof *hdr, data, len); + memcpy(packet->data + sizeof(*hdr), data, len); // Queue it if(!meshlink_queue_push(&mesh->outpacketqueue, packet)) { @@ -1052,15 +1720,18 @@ bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const } // Notify event loop - signal_trigger(&(mesh->loop),&(mesh->datafromapp)); - + signal_trigger(&(mesh->loop), &(mesh->datafromapp)); + 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); - if(!packet) + + if(!packet) { return; + } mesh->self->in_packets++; mesh->self->in_bytes += packet->len; @@ -1072,19 +1743,19 @@ ssize_t meshlink_get_pmtu(meshlink_handle_t *mesh, meshlink_node_t *destination) meshlink_errno = MESHLINK_EINVAL; return -1; } + pthread_mutex_lock(&(mesh->mesh_mutex)); node_t *n = (node_t *)destination; + 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; } @@ -1095,11 +1766,12 @@ char *meshlink_get_fingerprint(meshlink_handle_t *mesh, meshlink_node_t *node) { meshlink_errno = MESHLINK_EINVAL; return NULL; } + pthread_mutex_lock(&(mesh->mesh_mutex)); node_t *n = (node_t *)node; - if(!node_read_ecdsa_public_key(mesh, n) || !n->ecdsa) { + if(!node_read_public_key(mesh, n) || !n->ecdsa) { meshlink_errno = MESHLINK_EINTERNAL; pthread_mutex_unlock(&(mesh->mesh_mutex)); return false; @@ -1107,54 +1779,188 @@ char *meshlink_get_fingerprint(meshlink_handle_t *mesh, meshlink_node_t *node) { 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; + } + + 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_submesh_t *meshlink_get_submesh(meshlink_handle_t *mesh, const char *name) { + if(!mesh || !name) { + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + meshlink_submesh_t *submesh = NULL; + + pthread_mutex_lock(&(mesh->mesh_mutex)); + submesh = (meshlink_submesh_t *)lookup_submesh(mesh, name); + pthread_mutex_unlock(&(mesh->mesh_mutex)); + return submesh; +} + +meshlink_node_t **meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes, size_t *nmemb) { + if(!mesh || !nmemb || (*nmemb && !nodes)) { + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + meshlink_node_t **result; + + //lock mesh->nodes + pthread_mutex_lock(&(mesh->mesh_mutex)); + + *nmemb = mesh->nodes->count; + result = realloc(nodes, *nmemb * sizeof(*nodes)); + + if(result) { + meshlink_node_t **p = result; + + 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->mesh_mutex)); + + return result; +} + +static meshlink_node_t **meshlink_get_all_nodes_by_condition(meshlink_handle_t *mesh, const void *condition, meshlink_node_t **nodes, size_t *nmemb, search_node_by_condition_t search_node) { + meshlink_node_t **result; + + pthread_mutex_lock(&(mesh->mesh_mutex)); + + *nmemb = 0; + + for splay_each(node_t, n, mesh->nodes) { + if(true == search_node(n, condition)) { + *nmemb = *nmemb + 1; + } + } + + if(*nmemb == 0) { + free(nodes); + pthread_mutex_unlock(&(mesh->mesh_mutex)); + return NULL; + } + + result = realloc(nodes, *nmemb * sizeof(*nodes)); + + if(result) { + meshlink_node_t **p = result; + + for splay_each(node_t, n, mesh->nodes) { + if(true == search_node(n, condition)) { + *p++ = (meshlink_node_t *)n; + } + } + } else { + *nmemb = 0; + free(nodes); + meshlink_errno = MESHLINK_ENOMEM; + } + + pthread_mutex_unlock(&(mesh->mesh_mutex)); + + return result; +} + +static bool search_node_by_dev_class(const node_t *node, const void *condition) { + dev_class_t *devclass = (dev_class_t *)condition; + + if(*devclass == (dev_class_t)node->devclass) { + return true; + } + + return false; +} + +static bool search_node_by_submesh(const node_t *node, const void *condition) { + if(condition == node->submesh) { + return true; + } + + return false; +} + +meshlink_node_t **meshlink_get_all_nodes_by_dev_class(meshlink_handle_t *mesh, dev_class_t devclass, meshlink_node_t **nodes, size_t *nmemb) { + if(!mesh || ((int)devclass < 0) || (devclass > _DEV_CLASS_MAX) || !nmemb) { + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + return meshlink_get_all_nodes_by_condition(mesh, &devclass, nodes, nmemb, search_node_by_dev_class); +} + +meshlink_node_t **meshlink_get_all_nodes_by_submesh(meshlink_handle_t *mesh, meshlink_submesh_t *submesh, meshlink_node_t **nodes, size_t *nmemb) { + if(!mesh || !submesh || !nmemb) { + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } - pthread_mutex_unlock(&(mesh->mesh_mutex)); - return fingerprint; + return meshlink_get_all_nodes_by_condition(mesh, submesh, nodes, nmemb, search_node_by_submesh); } -meshlink_node_t *meshlink_get_node(meshlink_handle_t *mesh, const char *name) { - if(!mesh || !name) { +dev_class_t meshlink_get_node_dev_class(meshlink_handle_t *mesh, meshlink_node_t *node) { + if(!mesh || !node) { meshlink_errno = MESHLINK_EINVAL; - return NULL; + return -1; } - meshlink_node_t *node = NULL; + dev_class_t devclass; pthread_mutex_lock(&(mesh->mesh_mutex)); - node = (meshlink_node_t *)lookup_node(mesh, (char *)name); // TODO: make lookup_node() use const + + devclass = ((node_t *)node)->devclass; + pthread_mutex_unlock(&(mesh->mesh_mutex)); - return node; + + return devclass; } -meshlink_node_t **meshlink_get_all_nodes(meshlink_handle_t *mesh, meshlink_node_t **nodes, size_t *nmemb) { - if(!mesh || !nmemb || (*nmemb && !nodes)) { +meshlink_submesh_t *meshlink_get_node_submesh(meshlink_handle_t *mesh, meshlink_node_t *node) { + if(!mesh || !node) { meshlink_errno = MESHLINK_EINVAL; return NULL; } - meshlink_node_t **result; - - //lock mesh->nodes - pthread_mutex_lock(&(mesh->mesh_mutex)); - - *nmemb = mesh->nodes->count; - result = realloc(nodes, *nmemb * sizeof *nodes); + node_t *n = (node_t *)node; - if(result) { - meshlink_node_t **p = result; - for splay_each(node_t, n, mesh->nodes) - *p++ = (meshlink_node_t *)n; - } else { - *nmemb = 0; - free(nodes); - meshlink_errno = MESHLINK_ENOMEM; - } + meshlink_submesh_t *s; - pthread_mutex_unlock(&(mesh->mesh_mutex)); + s = (meshlink_submesh_t *)n->submesh; - return result; + return s; } bool meshlink_sign(meshlink_handle_t *mesh, const void *data, size_t len, void *signature, size_t *siglen) { @@ -1170,7 +1976,7 @@ bool meshlink_sign(meshlink_handle_t *mesh, const void *data, size_t len, void * pthread_mutex_lock(&(mesh->mesh_mutex)); - if(!ecdsa_sign(mesh->self->connection->ecdsa, data, len, signature)) { + if(!ecdsa_sign(mesh->private_key, data, len, signature)) { meshlink_errno = MESHLINK_EINTERNAL; pthread_mutex_unlock(&(mesh->mesh_mutex)); return false; @@ -1197,157 +2003,188 @@ bool meshlink_verify(meshlink_handle_t *mesh, meshlink_node_t *source, const voi bool rval = false; struct node_t *n = (struct node_t *)source; - node_read_ecdsa_public_key(mesh, n); - if(!n->ecdsa) { + + if(!node_read_public_key(mesh, n)) { meshlink_errno = MESHLINK_EINTERNAL; rval = false; } else { rval = 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]; - 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; + size_t count = invitation_purge_old(mesh, time(NULL) - mesh->invitation_timeout); + + if(!count) { + // TODO: Update invitation key if necessary? } - // 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)); + pthread_mutex_unlock(&(mesh->mesh_mutex)); + + return mesh->invitation_key; +} + +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; } - errno = 0; - int count = 0; - struct dirent *ent; - time_t deadline = time(NULL) - 604800; // 1 week in the past - - while((ent = readdir(dir))) { - 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(!stat(invname, &st)) { - if(mesh->invitation_key && deadline < st.st_mtime) - count++; - else - unlink(invname); - } else { - logger(mesh, MESHLINK_DEBUG, "Could not stat %s: %s\n", invname, strerror(errno)); - errno = 0; - } + if(!is_valid_hostname(address)) { + logger(mesh, MESHLINK_DEBUG, "Invalid character in address: %s\n", address); + meshlink_errno = MESHLINK_EINVAL; + return false; } - if(errno) { - 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)); + if(port && !is_valid_port(port)) { + logger(mesh, MESHLINK_DEBUG, "Invalid character in port: %s\n", address); + meshlink_errno = MESHLINK_EINVAL; return false; } - closedir(dir); + char *canonical_address; - snprintf(filename, sizeof filename, "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase); + if(port) { + xasprintf(&canonical_address, "%s %s", address, port); + } else { + canonical_address = xstrdup(address); + } - // 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; - } + pthread_mutex_lock(&(mesh->mesh_mutex)); + + node_t *n = (node_t *)node; + free(n->canonical_address); + n->canonical_address = canonical_address; + node_write_config(mesh, n); + + pthread_mutex_unlock(&(mesh->mesh_mutex)); + + return true; +} + +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; } - if(mesh->invitation_key) { - pthread_mutex_unlock(&(mesh->mesh_mutex)); - return true; + char *address = meshlink_get_external_address(mesh); + + if(!address) { + return false; } - // Create a new key if necessary. - FILE *f = fopen(filename, "r"); - 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; - } + bool rval = meshlink_add_address(mesh, address); + free(address); - 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"); - 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; - } + return rval; +} + +int meshlink_get_port(meshlink_handle_t *mesh) { + if(!mesh) { + meshlink_errno = MESHLINK_EINVAL; + return -1; } - pthread_mutex_unlock(&(mesh->mesh_mutex)); - return mesh->invitation_key; + if(!mesh->myport) { + meshlink_errno = MESHLINK_EINTERNAL; + return -1; + } + + return atoi(mesh->myport); } -bool meshlink_add_address(meshlink_handle_t *mesh, const char *address) { - if(!mesh || !address) { +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; + } + + devtool_trybind_probe(); + bool rval = false; pthread_mutex_lock(&(mesh->mesh_mutex)); - for(const char *p = address; *p; p++) { - if(isalnum(*p) || *p == '-' || *p == '.' || *p == ':') - continue; - logger(mesh, MESHLINK_DEBUG, "Invalid character in address: %s\n", address); + if(mesh->threadstarted) { meshlink_errno = MESHLINK_EINVAL; - pthread_mutex_unlock(&(mesh->mesh_mutex)); - return false; + goto done; + } + + free(mesh->myport); + xasprintf(&mesh->myport, "%d", port); + + /* Write meshlink.conf with the updated port number */ + write_main_config_files(mesh); + + /* Close down the network. This also deletes mesh->self. */ + close_network_connections(mesh); + + /* Recreate mesh->self. */ + mesh->self = new_node(); + mesh->self->name = xstrdup(mesh->name); + mesh->self->devclass = mesh->devclass; + xasprintf(&mesh->myport, "%d", port); + + if(!node_read_public_key(mesh, mesh->self)) { + logger(NULL, MESHLINK_ERROR, "Could not read our host configuration file!"); + meshlink_errno = MESHLINK_ESTORAGE; + free_node(mesh->self); + mesh->self = NULL; + } else if(!setup_network(mesh)) { + meshlink_errno = MESHLINK_ENETWORK; + } else { + rval = true; } - rval = append_config_file(mesh, mesh->self->name, "Address", address); +done: pthread_mutex_unlock(&(mesh->mesh_mutex)); - return rval; + + return rval && meshlink_get_port(mesh) == port; +} + +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) { +char *meshlink_invite_ex(meshlink_handle_t *mesh, meshlink_submesh_t *submesh, const char *name, uint32_t flags) { + meshlink_submesh_t *s = NULL; + if(!mesh) { meshlink_errno = MESHLINK_EINVAL; return NULL; } - + + if(submesh) { + s = (meshlink_submesh_t *)lookup_submesh(mesh, submesh->name); + + if(s != submesh) { + logger(mesh, MESHLINK_DEBUG, "Invalid SubMesh Handle.\n"); + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + } else { + s = (meshlink_submesh_t *)mesh->self->submesh; + } + pthread_mutex_lock(&(mesh->mesh_mutex)); // Check validity of the new node's name @@ -1359,9 +2196,7 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) { } // 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); - if(!access(filename, F_OK)) { + if(config_exists(mesh, "current", name)) { logger(mesh, MESHLINK_DEBUG, "A host config file for %s already exists!\n", name); meshlink_errno = MESHLINK_EEXIST; pthread_mutex_unlock(&(mesh->mesh_mutex)); @@ -1377,7 +2212,8 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) { } // Get the local address - char *address = get_my_hostname(mesh); + char *address = get_my_hostname(mesh, flags); + if(!address) { logger(mesh, MESHLINK_DEBUG, "No Address known for ourselves!\n"); meshlink_errno = MESHLINK_ERESOLV; @@ -1406,62 +2242,51 @@ 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); free(fingerprint); - // Create a file containing the details of the invitation. - snprintf(filename, sizeof filename, "%s" SLASH "invitations" SLASH "%s", mesh->confbase, cookiehash); - int ifd = open(filename, O_RDWR | O_CREAT | O_EXCL, 0600); - 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; + /* Construct the invitation file */ + uint8_t outbuf[4096]; + packmsg_output_t inv = {outbuf, sizeof(outbuf)}; + + packmsg_add_uint32(&inv, MESHLINK_INVITATION_VERSION); + packmsg_add_str(&inv, name); + packmsg_add_str(&inv, s ? s->name : CORE_MESH); + packmsg_add_int32(&inv, DEV_CLASS_UNKNOWN); /* TODO: allow this to be set by inviter? */ + + /* TODO: Add several host config files to bootstrap connections. + * Note: make sure we only add config files of nodes that are in the core mesh or the same submesh, + * and are not blacklisted. + */ + config_t configs[5] = {NULL}; + int count = 0; + + if(config_read(mesh, "current", mesh->self->name, &configs[count], mesh->config_key)) { + count++; } - FILE *f = fdopen(ifd, "w"); - 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); - FILE *tc = fopen(filename, "r"); - if(tc) { - char buf[1024]; - while(fgets(buf, sizeof buf, tc)) { - if((!strncasecmp(buf, "Mode", 4) && strchr(" \t=", buf[4])) - || (!strncasecmp(buf, "Broadcast", 9) && strchr(" \t=", buf[9]))) { - fputs(buf, f); - // Make sure there is a newline character. - if(!strchr(buf, '\n')) - fputc('\n', f); - } - } - fclose(tc); - } else { - logger(mesh, MESHLINK_DEBUG, "Could not create %s: %s\n", filename, strerror(errno)); + /* Append host config files to the invitation file */ + packmsg_add_array(&inv, count); + + for(int i = 0; i < count; i++) { + packmsg_add_bin(&inv, configs[i].buf, configs[i].len); + config_free(&configs[i]); + } + + config_t config = {outbuf, packmsg_output_size(&inv, outbuf)}; + + if(!invitation_write(mesh, "current", cookiehash, &config, mesh->config_key)) { + logger(mesh, MESHLINK_DEBUG, "Could not create invitation file %s: %s\n", cookiehash, 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); - fcopy(f, filename); - fclose(f); - // Create an URL from the local address, key hash and cookie char *url; xasprintf(&url, "%s/%s%s", address, hash, cookie); @@ -1471,53 +2296,62 @@ char *meshlink_invite(meshlink_handle_t *mesh, const char *name) { return url; } +char *meshlink_invite(meshlink_handle_t *mesh, meshlink_submesh_t *submesh, const char *name) { + return meshlink_invite_ex(mesh, submesh, name, 0); +} + bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { if(!mesh || !invitation) { meshlink_errno = MESHLINK_EINVAL; 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_ERROR, "Cannot join while started\n"); + meshlink_errno = MESHLINK_EINVAL; + pthread_mutex_unlock(&(mesh->mesh_mutex)); + return false; + } + + // Refuse to join a mesh if we are already part of one. We are part of one if we know at least one other node. + if(mesh->nodes->count > 1) { + logger(mesh, MESHLINK_ERROR, "Already part of an existing 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)); @@ -1525,47 +2359,90 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { } 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; - pthread_mutex_unlock(&(mesh->mesh_mutex)); - 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; - pthread_mutex_unlock(&(mesh->mesh_mutex)); - 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_in_netns(aip->ai_family, aip->ai_socktype, aip->ai_protocol, mesh->netns); + + 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; - pthread_mutex_unlock(&(mesh->mesh_mutex)); + 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, PROT_MINOR, 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; @@ -1578,7 +2455,7 @@ 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; @@ -1589,12 +2466,14 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { // 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; @@ -1604,6 +2483,7 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { } ecdsa_t *hiskey = ecdsa_set_base64_public_key(fingerprint); + if(!hiskey) { meshlink_errno = MESHLINK_EINTERNAL; pthread_mutex_unlock(&(mesh->mesh_mutex)); @@ -1611,7 +2491,7 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { } // 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; @@ -1626,10 +2506,12 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { 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)); @@ -1659,7 +2541,7 @@ bool meshlink_join(meshlink_handle_t *mesh, const char *invitation) { 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; @@ -1671,38 +2553,64 @@ char *meshlink_export(meshlink_handle_t *mesh) { return NULL; } + // Create a config file on the fly. + + uint8_t buf[4096]; + packmsg_output_t out = {buf, sizeof(buf)}; + packmsg_add_uint32(&out, MESHLINK_CONFIG_VERSION); + packmsg_add_str(&out, mesh->name); + packmsg_add_str(&out, CORE_MESH); + pthread_mutex_lock(&(mesh->mesh_mutex)); - - char filename[PATH_MAX]; - 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)); + + packmsg_add_int32(&out, mesh->self->devclass); + packmsg_add_bool(&out, mesh->self->status.blacklisted); + packmsg_add_bin(&out, ecdsa_get_public_key(mesh->private_key), 32); + packmsg_add_str(&out, mesh->self->canonical_address ? mesh->self->canonical_address : ""); + + uint32_t count = 0; + + for(uint32_t i = 0; i < 5; i++) { + if(mesh->self->recent[i].sa.sa_family) { + count++; + } else { + break; + } + } + + packmsg_add_array(&out, count); + + for(uint32_t i = 0; i < count; i++) { + packmsg_add_sockaddr(&out, &mesh->self->recent[i]); + } + + pthread_mutex_unlock(&(mesh->mesh_mutex)); + + if(!packmsg_output_ok(&out)) { + logger(mesh, MESHLINK_DEBUG, "Error creating export data\n"); + meshlink_errno = MESHLINK_EINTERNAL; return NULL; } - fseek(f, 0, SEEK_END); - int fsize = ftell(f); - rewind(f); + // Prepare a base64-encoded packmsg array containing our config file - 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); - meshlink_errno = MESHLINK_ESTORAGE; - pthread_mutex_unlock(&(mesh->mesh_mutex)); + uint32_t len = packmsg_output_size(&out, buf); + uint32_t len2 = ((len + 4) * 4) / 3 + 4; + uint8_t *buf2 = xmalloc(len2); + packmsg_output_t out2 = {buf2, len2}; + packmsg_add_array(&out2, 1); + packmsg_add_bin(&out2, buf, packmsg_output_size(&out, buf)); + + if(!packmsg_output_ok(&out2)) { + logger(mesh, MESHLINK_DEBUG, "Error creating export data\n"); + meshlink_errno = MESHLINK_EINTERNAL; + free(buf2); return NULL; } - fclose(f); - buf[len - 1] = 0; - - pthread_mutex_unlock(&(mesh->mesh_mutex)); - return buf; + b64encode_urlsafe(buf2, (char *)buf2, packmsg_output_size(&out2, buf2)); + + return (char *)buf2; } bool meshlink_import(meshlink_handle_t *mesh, const char *data) { @@ -1710,65 +2618,82 @@ bool meshlink_import(meshlink_handle_t *mesh, const char *data) { meshlink_errno = MESHLINK_EINVAL; return false; } - - pthread_mutex_lock(&(mesh->mesh_mutex)); - if(strncmp(data, "Name = ", 7)) { + size_t datalen = strlen(data); + uint8_t *buf = xmalloc(datalen); + int buflen = b64decode(data, buf, datalen); + + if(!buflen) { 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) { + packmsg_input_t in = {buf, buflen}; + uint32_t count = packmsg_get_array(&in); + + if(!count) { logger(mesh, MESHLINK_DEBUG, "Invalid data\n"); meshlink_errno = MESHLINK_EPEER; - pthread_mutex_unlock(&(mesh->mesh_mutex)); return false; } - int len = end - (data + 7); - 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; - } + pthread_mutex_lock(&(mesh->mesh_mutex)); - char filename[PATH_MAX]; - 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; - } + while(count--) { + const void *data; + uint32_t len = packmsg_get_bin_raw(&in, &data); - 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; - } + if(!len) { + break; + } - 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; - } + packmsg_input_t in2 = {data, len}; + uint32_t version = packmsg_get_uint32(&in2); + char *name = packmsg_get_str_dup(&in2); + + if(!packmsg_input_ok(&in2) || version != MESHLINK_CONFIG_VERSION || !check_id(name)) { + free(name); + packmsg_input_invalidate(&in); + break; + } + + if(!check_id(name)) { + free(name); + break; + } + + node_t *n = lookup_node(mesh, name); + + if(n) { + logger(mesh, MESHLINK_DEBUG, "Node %s already exists, not importing\n", name); + free(name); + continue; + } + + n = new_node(); + n->name = name; - fwrite(end + 1, strlen(end + 1), 1, f); - fclose(f); + config_t config = {data, len}; + + if(!node_read_from_config(mesh, n, &config)) { + free_node(n); + packmsg_input_invalidate(&in); + break; + } - load_all_nodes(mesh); + config_write(mesh, "current", n->name, &config, mesh->config_key); + node_add(mesh, n); + } pthread_mutex_unlock(&(mesh->mesh_mutex)); + + if(!packmsg_done(&in)) { + logger(mesh, MESHLINK_ERROR, "Invalid data\n"); + meshlink_errno = MESHLINK_EPEER; + return false; + } + return true; } @@ -1779,17 +2704,47 @@ void meshlink_blacklist(meshlink_handle_t *mesh, meshlink_node_t *node) { } 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; + + if(n == mesh->self) { + logger(mesh, MESHLINK_ERROR, "%s blacklisting itself?\n", node->name); + meshlink_errno = MESHLINK_EINVAL; + pthread_mutex_unlock(&(mesh->mesh_mutex)); + return; + } + + if(n->status.blacklisted) { + logger(mesh, MESHLINK_DEBUG, "Node %s already blacklisted\n", node->name); + pthread_mutex_unlock(&(mesh->mesh_mutex)); + return; + } + + n->status.blacklisted = true; + node_write_config(mesh, n); + logger(mesh, MESHLINK_DEBUG, "Blacklisted %s.\n", node->name); + + //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); + } + } + + utcp_abort_all_connections(n->utcp); - //Make blacklisting persistent in the config file - append_config_file(mesh, n->name, "blacklisted", "yes"); + n->mtu = 0; + n->minmtu = 0; + n->maxmtu = MTU; + n->mtuprobes = 0; + n->status.udp_confirmed = false; + + if(n->status.reachable) { + update_node_status(mesh, n); + } pthread_mutex_unlock(&(mesh->mesh_mutex)); - return; } void meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) { @@ -1799,233 +2754,347 @@ void meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) { } pthread_mutex_lock(&(mesh->mesh_mutex)); - + node_t *n = (node_t *)node; - n->status.blacklisted = false; - //TODO: remove blacklisted = yes from the config file + if(!n->status.blacklisted) { + logger(mesh, MESHLINK_DEBUG, "Node %s was already whitelisted\n", node->name); + meshlink_errno = MESHLINK_EINVAL; + pthread_mutex_unlock(&(mesh->mesh_mutex)); + return; + } + + n->status.blacklisted = false; + node_write_config(mesh, n); 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. */ void meshlink_hint_address(meshlink_handle_t *mesh, meshlink_node_t *node, const struct sockaddr *addr) { - if(!mesh || !node || !addr) + if(!mesh || !node || !addr) { + meshlink_errno = EINVAL; 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); - if ( (strncmp ("fe80",host,4) != 0) && ( strncmp("127.",host,4) != 0 ) && ( strcmp("localhost",host) !=0 ) ) - append_config_file(mesh, node->name, "Address", str); - 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? -} - -/* Return an array of edges in the current network graph. - * Data captures the current state and will not be updated. - * Caller must deallocate data when done. - */ -meshlink_edge_t **meshlink_get_all_edges_state(meshlink_handle_t *mesh, meshlink_edge_t **edges, size_t *nmemb) { - if(!mesh || !nmemb || (*nmemb && !edges)) { - meshlink_errno = MESHLINK_EINVAL; - return NULL; } pthread_mutex_lock(&(mesh->mesh_mutex)); - - meshlink_edge_t **result = NULL; - meshlink_edge_t *copy = NULL; - int result_size = 0; - - result_size = mesh->edges->count; - // if result is smaller than edges, we have to dealloc all the excess meshlink_edge_t - if(result_size > *nmemb) { - result = realloc(edges, result_size * sizeof (meshlink_edge_t*)); - } else { - result = edges; - } - - if(result) { - meshlink_edge_t **p = result; - int n = 0; - for splay_each(edge_t, e, mesh->edges) { - // skip edges that do not represent a two-directional connection - if((!e->reverse) || (e->reverse->to != e->from)) { - result_size--; - continue; - } - n++; - // the first *nmemb members of result can be re-used - if(n > *nmemb) { - copy = xzalloc(sizeof *copy); - } - else { - copy = *p; - } - copy->from = (meshlink_node_t*)e->from; - copy->to = (meshlink_node_t*)e->to; - copy->address = e->address.storage; - copy->options = e->options; - copy->weight = e->weight; - *p++ = copy; - } - // shrink result to the actual amount of memory used - for(int i = *nmemb; i > result_size; i--) { - free(result[i - 1]); - } - result = realloc(result, result_size * sizeof (meshlink_edge_t*)); - *nmemb = result_size; - } else { - *nmemb = 0; - free(result); - meshlink_errno = MESHLINK_ENOMEM; - } + node_t *n = (node_t *)node; + memmove(n->recent + 1, n->recent, 4 * sizeof(*n->recent)); + memcpy(n->recent, addr, SALEN(*addr)); + node_write_config(mesh, n); pthread_mutex_unlock(&(mesh->mesh_mutex)); - - return result; + // @TODO do we want to fire off a connection attempt right away? } static bool channel_pre_accept(struct utcp *utcp, uint16_t port) { - //TODO: implement - return true; + (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) + + if(!channel) { abort(); + } + node_t *n = channel->node; meshlink_handle_t *mesh = n->mesh; - if(!channel->receive_cb) - return -1; - else { + + if(n->status.destroyed) { + meshlink_channel_close(mesh, channel); + } else if(channel->receive_cb) { channel->receive_cb(mesh, channel, data, len); - return len; } + + return len; } static void channel_accept(struct utcp_connection *utcp_connection, uint16_t port) { node_t *n = utcp_connection->utcp->priv; - if(!n) + + if(!n) { abort(); + } + meshlink_handle_t *mesh = n->mesh; - if(!mesh->channel_accept_cb) + + if(!mesh->channel_accept_cb) { return; - meshlink_channel_t *channel = xzalloc(sizeof *channel); + } + + meshlink_channel_t *channel = xzalloc(sizeof(*channel)); channel->node = n; channel->c = utcp_connection; - if(mesh->channel_accept_cb(mesh, channel, port, NULL, 0)) + + if(mesh->channel_accept_cb(mesh, channel, port, NULL, 0)) { utcp_accept(utcp_connection, channel_recv, channel); - else + } 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; - char hex[len * 2 + 1]; - bin2hex(data, hex, len); - logger(mesh, MESHLINK_WARNING, "channel_send(%p, %p, %zu): %s\n", utcp, data, len, hex); - return meshlink_send(mesh, (meshlink_node_t *)n, data, len) ? len : -1; + 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) + + if(!n->utcp) { abort(); - char hex[len * 2 + 1]; - bin2hex(data, hex, len); - logger(mesh, MESHLINK_WARNING, "channel_receive(%p, %p, %zu): %s\n", n->utcp, data, len, hex); + } + 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) { - logger(mesh, MESHLINK_WARNING, "utcp_init on node %s", n->name); n->utcp = utcp_init(channel_accept, channel_pre_accept, channel_send, n); } } + pthread_mutex_unlock(&mesh->mesh_mutex); } -void meshlink_channel_init(meshlink_handle_t *mesh) { -} +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; + } -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) { - logger(mesh, MESHLINK_WARNING, "meshlink_channel_open(%p, %s, %u, %p, %p, %zu)\n", mesh, node->name, port, cb, data, len); 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); + + if(n->status.blacklisted) { + logger(mesh, MESHLINK_ERROR, "Cannot open a channel with blacklisted node\n"); + return NULL; + } + + meshlink_channel_t *channel = xzalloc(sizeof(*channel)); channel->node = n; channel->receive_cb = cb; - channel->c = utcp_connect(n->utcp, port, channel_recv, channel); + 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) { - // TODO: locking. + 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, + // Then, preferably only if there is room in the receiver window, // kick the meshlink thread to go send packets. - return utcp_send(channel->c, data, len); + + 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; +} + +size_t meshlink_channel_get_sendq(meshlink_handle_t *mesh, meshlink_channel_t *channel) { + if(!mesh || !channel) { + meshlink_errno = MESHLINK_EINVAL; + return -1; + } + + return utcp_get_sendq(channel->c); +} + +size_t meshlink_channel_get_recvq(meshlink_handle_t *mesh, meshlink_channel_t *channel) { + if(!mesh || !channel) { + meshlink_errno = MESHLINK_EINVAL; + return -1; + } + + return utcp_get_recvq(channel->c); } void update_node_status(meshlink_handle_t *mesh, node_t *n) { - if(n->status.reachable && mesh->channel_accept_cb && !n->utcp) + 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); + } + + if(mesh->node_status_cb) { + mesh->node_status_cb(mesh, (meshlink_node_t *)n, n->status.reachable && !n->status.blacklisted); + } +} + +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) { @@ -2033,9 +3102,9 @@ static void __attribute__((destructor)) meshlink_exit(void) { } /// 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 };