/*
meshlink.c -- Implementation of the MeshLink API.
- Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
+ Copyright (C) 2014-2018 Guus Sliepen <guus@meshlink.io>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
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 <pthread.h>
#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 "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);
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");
+ *hostname = xstrdup(n->canonical_address);
+ char *space = strchr(*hostname, ' ');
- if(!f) {
- return;
+ if(space) {
+ *space++ = 0;
+ *port = xstrdup(space);
}
+}
- 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 ");
- }
-
- // q is now pointing to the hostname
- *p = 0;
- p = q + strcspn(q, "\t ");
-
- if(*p) {
- *p++ = 0;
- }
-
- p += strspn(p, "\t ");
- p[strcspn(p, "\t ")] = 0;
- // p is now pointing to the port
+static bool is_valid_hostname(const char *hostname) {
+ if(!*hostname) {
+ return false;
+ }
- // Check that the hostname is a symbolic name (it's not a numeric IPv4 or IPv6 address)
- if(!q[strspn(q, "0123456789.")] || strchr(q, ':')) {
- continue;
+ for(const char *p = hostname; *p; p++) {
+ if(!(isalnum(*p) || *p == '-' || *p == '.' || *p == ':')) {
+ return false;
}
+ }
- if(!*port && !strcasecmp(line, "Port")) {
- *port = xstrdup(q);
- } else if(!*hostname && !strcasecmp(line, "Address")) {
- *hostname = xstrdup(q);
-
- if(*p) {
- free(*port);
- *port = xstrdup(p);
- }
- }
+ return true;
+}
- if(*hostname && *port) {
- break;
- }
+static bool is_valid_port(const char *port) {
+ if(!*port) {
+ return false;
}
- fclose(f);
-}
+ if(isdigit(*port)) {
+ char *end;
+ unsigned long int result = strtoul(port, &end, 10);
+ return result && result < 65536 && !*end;
+ }
-static bool is_valid_hostname(const char *hostname) {
- for(const char *p = hostname; *p; p++) {
- if(!(isalnum(*p) || *p == '-' || *p == '.' || *p == ':')) {
+ for(const char *p = port; *p; p++) {
+ if(!(isalnum(*p) || *p == '-')) {
return false;
}
}
setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
}
+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 getlocaladdrname(char *destaddr, char *host, socklen_t hostlen) {
+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,
return false;
}
- int sock = socket(rai->ai_family, rai->ai_socktype, rai->ai_protocol);
+ int sock = socket_in_netns(rai->ai_family, rai->ai_socktype, rai->ai_protocol, netns);
if(sock == -1) {
freeaddrinfo(rai);
}
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(getsockname(sock, (struct sockaddr *)&sn, &sl)) {
+ if(!getlocaladdr(destaddr, (struct sockaddr *)&sn, &sl, netns)) {
return false;
}
continue;
}
- int s = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol);
+ int s = socket_in_netns(aip->ai_family, aip->ai_socktype, aip->ai_protocol, mesh->netns);
if(s >= 0) {
set_timeout(s, 5000);
hostname = NULL;
}
- // If there is no hostname, determine the address used for an outgoing connection.
- if(!hostname) {
- char localaddr[NI_MAXHOST];
- bool success = false;
-
- if(family == AF_INET) {
- success = getlocaladdrname("93.184.216.34", localaddr, sizeof(localaddr));
- } else if(family == AF_INET6) {
- success = getlocaladdrname("2606:2800:220:1:248:1893:25c8:1946", localaddr, sizeof(localaddr));
- }
-
- if(success) {
- hostname = xstrdup(localaddr);
- }
- }
-
if(!hostname) {
meshlink_errno = MESHLINK_ERESOLV;
}
return hostname;
}
-// This gets the hostname part for use in invitation URLs
-static char *get_my_hostname(meshlink_handle_t *mesh) {
- char *hostname[2] = {NULL};
- char *port = NULL;
- char *hostport = NULL;
- char *name = mesh->self->name;
- char filename[PATH_MAX] = "";
+char *meshlink_get_local_address_for_family(meshlink_handle_t *mesh, int family) {
+ (void)mesh;
- // 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[0], &port);
+ // Determine address of the local interface used for outgoing connections.
+ char localaddr[NI_MAXHOST];
+ bool success = false;
- if(hostname[0]) {
- goto done;
+ 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);
}
- hostname[0] = meshlink_get_external_address_for_family(mesh, AF_INET);
- hostname[1] = meshlink_get_external_address_for_family(mesh, AF_INET6);
-
- if(!hostname[0] && !hostname[1]) {
+ if(!success) {
+ meshlink_errno = MESHLINK_ENETWORK;
return NULL;
}
- if(!strcmp(hostname[0], hostname[1])) {
- free(hostname[1]);
- hostname[1] = NULL;
- }
-
- port = xstrdup(mesh->myport);
+ return xstrdup(localaddr);
+}
- for(int i = 0; i < 2; i++) {
- if(hostname[i]) {
- char *tmphostport;
- xasprintf(&tmphostport, "%s %s", hostname[i], port);
- append_config_file(mesh, mesh->self->name, "Address", tmphostport);
- free(tmphostport);
+void remove_duplicate_hostnames(char *host[], char *port[], int n) {
+ for(int i = 0; i < n; i++) {
+ if(!host[i]) {
+ continue;
}
- }
-done:
+ // Ignore duplicate hostnames
+ bool found = false;
- for(int i = 0; i < 2; i++) {
- if(!hostname[i]) {
+ 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;
+ }
+
+ found = true;
+ break;
+ }
+
+ if(found) {
+ free(host[i]);
+ free(port[i]);
+ host[i] = NULL;
+ port[i] = NULL;
continue;
}
+ }
+}
- char *newhostport;
- xasprintf(&newhostport, (strchr(hostname[i], ':') ? "%s%s[%s]" : "%s%s%s"), hostport ? hostport : "", hostport ? "," : "", hostname[i]);
- free(hostname[i]);
- free(hostport);
- hostport = newhostport;
+// 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;
+
+ if(!(flags & (MESHLINK_INVITE_LOCAL | MESHLINK_INVITE_PUBLIC))) {
+ flags |= MESHLINK_INVITE_LOCAL | MESHLINK_INVITE_PUBLIC;
}
- if(port) {
- char *newhostport;
- xasprintf(&newhostport, "%s:%s", hostport, port);
- free(port);
- free(hostport);
- hostport = newhostport;
+ if(!(flags & (MESHLINK_INVITE_IPV4 | MESHLINK_INVITE_IPV6))) {
+ flags |= MESHLINK_INVITE_IPV4 | MESHLINK_INVITE_IPV6;
}
- 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]);
- static char line[1024];
- const char *end = strchr(*data, '\n');
- size_t len = end ? (size_t)(end - *data) : strlen(*data);
+ if(!hostname[2]) {
+ if(flags & MESHLINK_INVITE_IPV4) {
+ hostname[2] = meshlink_get_external_address_for_family(mesh, AF_INET);
+ }
- if(len >= sizeof(line)) {
- logger(NULL, MESHLINK_ERROR, "Maximum line length exceeded!\n");
- return NULL;
+ if(flags & MESHLINK_INVITE_IPV6) {
+ hostname[3] = meshlink_get_external_address_for_family(mesh, AF_INET6);
+ }
+ }
}
- if(len && !isprint(**data)) {
- abort();
+ for(int i = 0; i < 4; i++) {
+ // Ensure we always have a port number
+ if(hostname[i] && !port[i]) {
+ port[i] = xstrdup(mesh->myport);
+ }
}
- 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(err || !ai_in) {
+ continue;
+ }
- if(!line) {
- return NULL;
- }
+ // 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);
- char *sep = line + strcspn(line, " \t=");
- char *val = sep + strspn(sep, " \t");
+ 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);
- if(*val == '=') {
- val += 1 + strspn(val + 1, " \t");
+ freeaddrinfo(ai_in);
+ freeaddrinfo(ai_out);
+ }
}
- *sep = 0;
+ // Remove duplicates again, since IPv4 and IPv6 addresses might map to the same hostname
+ remove_duplicate_hostnames(hostname, port, 4);
- if(strcasecmp(line, var)) {
- return NULL;
+ // 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 val;
+ return hostport;
}
static bool try_bind(int port) {
return false;
}
- while(ai) {
- int fd = socket(ai->ai_family, SOCK_STREAM, IPPROTO_TCP);
+ //while(ai) {
+ for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
+ int fd = socket(aip->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);
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) {
- meshlink_errno = MESHLINK_ESTORAGE;
- logger(mesh, MESHLINK_DEBUG, "Could not store Port.\n");
- return 0;
- }
-
- fprintf(f, "Port = %d\n", port);
- fclose(f);
+ free(mesh->myport);
+ xasprintf(&mesh->myport, "%d", port);
return port;
}
}
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];
- if(!name) {
- logger(mesh, MESHLINK_DEBUG, "No Name found in invitation!\n");
+ /* 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;
}
- if(!check_id(name)) {
- logger(mesh, MESHLINK_DEBUG, "Invalid Name found in invitation: %s!\n", name);
+ 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;
}
- char filename[PATH_MAX];
- snprintf(filename, sizeof(filename), "%s" SLASH "meshlink.conf", mesh->confbase);
+ return true;
+}
- FILE *f = fopen(filename, "w");
+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(!f) {
- logger(mesh, MESHLINK_DEBUG, "Could not create file %s: %s\n", filename, strerror(errno));
+ if(version != MESHLINK_INVITATION_VERSION) {
+ logger(mesh, MESHLINK_ERROR, "Invalid invitation version!\n");
return false;
}
- fprintf(f, "Name = %s\n", name);
+ 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);
- snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
- FILE *fh = fopen(filename, "w");
+ if(!name) {
+ logger(mesh, MESHLINK_DEBUG, "No Name found in invitation!\n");
+ return false;
+ }
- if(!fh) {
- logger(mesh, MESHLINK_DEBUG, "Could not create file %s: %s\n", filename, strerror(errno));
- fclose(f);
+ if(!check_id(name)) {
+ logger(mesh, MESHLINK_DEBUG, "Invalid Name found in invitation: %s!\n", name);
+ free(name);
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(!count) {
+ logger(mesh, MESHLINK_ERROR, "Incomplete invitation file!\n");
+ free(name);
+ return false;
+ }
- while((l = get_line(&p))) {
- // Ignore comments
- if(*l == '#') {
- continue;
- }
+ free(mesh->name);
+ free(mesh->self->name);
+ mesh->name = name;
+ mesh->self->name = xstrdup(name);
+ mesh->self->devclass = devclass == DEV_CLASS_UNKNOWN ? mesh->devclass : devclass;
- // Split line into variable and value
- int len = strcspn(l, "\t =");
- value = l + len;
- value += strspn(value, "\t ");
+ // Initialize configuration directory
+ if(!config_init(mesh, "current")) {
+ return false;
+ }
- if(*value == '=') {
- value++;
- value += strspn(value, "\t ");
- }
+ if(!write_main_config_files(mesh)) {
+ return false;
+ }
- l[len] = 0;
+ // Write host config files
+ while(count--) {
+ const void *data;
+ uint32_t len = packmsg_get_bin_raw(&in, &data);
- // Is it a Name?
- if(!strcasecmp(l, "Name"))
- if(strcmp(value, name)) {
- break;
- } else {
- continue;
- } else if(!strcasecmp(l, "NetName")) {
- continue;
+ if(!len) {
+ logger(mesh, MESHLINK_ERROR, "Incomplete invitation file!\n");
+ return false;
}
- // 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;
- }
+ packmsg_input_t in2 = {data, len};
+ uint32_t version = packmsg_get_uint32(&in2);
+ char *name = packmsg_get_str_dup(&in2);
- 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;
}
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;
+ return finalize_join(mesh, msg, len);
case 1:
- mesh->thedatalen = 0;
- return finalize_join(mesh);
-
- case 2:
logger(mesh, MESHLINK_DEBUG, "Invitation succesfully accepted.\n");
shutdown(mesh->sock, SHUT_RDWR);
mesh->success = true;
return true;
}
+
static bool sendline(int fd, char *format, ...) {
- static char buffer[4096];
+ char buffer[4096];
char *p = buffer;
int blen = 0;
va_list ap;
[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) {
}
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");
- }
-
- if(snprintf(privname, sizeof(privname), "%s" SLASH "ecdsa_key.priv", mesh->confbase) >= PATH_MAX) {
- logger(mesh, MESHLINK_DEBUG, "Filename too long: %s" SLASH "ecdsa_key.priv\n", mesh->confbase);
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
- }
-
- f = fopen(privname, "wb");
-
- if(!f) {
- 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);
- meshlink_errno = MESHLINK_EINTERNAL;
- return false;
- }
-
- fclose(f);
-
- snprintf(pubname, sizeof(pubname), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, mesh->name);
- f = fopen(pubname, "a");
-
- if(!f) {
- 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);
+ logger(mesh, MESHLINK_DEBUG, "Done.\n");
return true;
}
// Get our local address(es) by simulating connecting to an Internet host.
static void add_local_addresses(meshlink_handle_t *mesh) {
- char host[NI_MAXHOST];
- char entry[MAX_STRING_SIZE];
+ struct sockaddr_storage sn;
+ socklen_t sl = sizeof(sn);
// IPv4 example.org
- if(getlocaladdrname("93.184.216.34", host, sizeof(host))) {
- snprintf(entry, sizeof(entry), "%s %s", host, mesh->myport);
- append_config_file(mesh, mesh->name, "Address", entry);
+ 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
- if(getlocaladdrname("2606:2800:220:1:248:1893:25c8:1946", host, sizeof(host))) {
- snprintf(entry, sizeof(entry), "%s %s", host, mesh->myport);
- append_config_file(mesh, mesh->name, "Address", entry);
+ 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(mkdir(mesh->confbase, 0777) && errno != EEXIST) {
- logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", mesh->confbase, strerror(errno));
+ 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;
}
- char filename[PATH_MAX];
- snprintf(filename, sizeof(filename), "%s" SLASH "hosts", mesh->confbase);
+ if(!ecdsa_keygen(mesh)) {
+ meshlink_errno = MESHLINK_EINTERNAL;
+ return false;
+ }
+
+ if(check_port(mesh) == 0) {
+ meshlink_errno = MESHLINK_ENETWORK;
+ return false;
+ }
+
+ /* Create a node for ourself */
+
+ 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(mkdir(filename, 0777) && errno != EEXIST) {
- logger(mesh, MESHLINK_DEBUG, "Could not create directory %s: %s\n", filename, strerror(errno));
+ 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;
}
- snprintf(filename, sizeof(filename), "%s" SLASH "meshlink.conf", mesh->confbase);
+ if(!main_config_lock(mesh)) {
+ logger(NULL, MESHLINK_ERROR, "Cannot lock main config file\n");
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
+ }
- if(!access(filename, F_OK)) {
- logger(mesh, MESHLINK_DEBUG, "Configuration file %s already exists!\n", filename);
- meshlink_errno = MESHLINK_EEXIST;
+ return true;
+}
+
+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;
+ }
+
+ config_t config;
+
+ if(!main_config_read(mesh, "current", &config, mesh->config_key)) {
+ logger(NULL, MESHLINK_ERROR, "Could not read main configuration file!");
+ return false;
+ }
+
+ packmsg_input_t in = {config.buf, config.len};
+ const void *private_key;
+ const void *invitation_key;
+
+ 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 0
- if(!f) {
- logger(mesh, MESHLINK_DEBUG, "Could not create file %s: %s\n", filename, strerror(errno));
+ // 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)) {
+ 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;
+ }
+
+ return true;
+}
+
+#ifdef HAVE_SETNS
+static void *setup_network_in_netns_thread(void *arg) {
+ meshlink_handle_t *mesh = arg;
+
+ if(setns(mesh->netns, CLONE_NEWNET) != 0) {
+ return NULL;
+ }
+
+ 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;
+ return NULL;
+ }
+
+ if(!appname || !*appname) {
+ logger(NULL, MESHLINK_ERROR, "No appname given!\n");
+ meshlink_errno = MESHLINK_EINVAL;
+ 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;
+ }
+ }
+
+ 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;
- unlink(filename);
+ pthread_mutex_unlock(&(mesh->mesh_mutex));
return false;
}
- if(check_port(mesh) == 0) {
- meshlink_errno = MESHLINK_ENETWORK;
- unlink(filename);
+ // 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) {
- // Validate arguments provided by the application
- bool usingname = false;
+ if(!confbase || !*confbase) {
+ logger(NULL, MESHLINK_ERROR, "No confbase given!\n");
+ meshlink_errno = MESHLINK_EINVAL;
+ return NULL;
+ }
- logger(NULL, MESHLINK_DEBUG, "meshlink_open called\n");
+ /* 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;
}
- if(!appname || !*appname) {
+ /* 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(!name || !*name) {
+ 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(name)) {
+ if(!check_id(params->name)) {
logger(NULL, MESHLINK_ERROR, "Invalid name given!\n");
meshlink_errno = MESHLINK_EINVAL;
return NULL;
}
}
- if((int)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;
}
+ 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));
- mesh->confbase = xstrdup(confbase);
- mesh->appname = xstrdup(appname);
- mesh->devclass = devclass;
+
+ 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(name);
+ 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
meshlink_queue_init(&mesh->outpacketqueue);
- // Check whether meshlink.conf already exists
-
- 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
- if(!setup_network(mesh)) {
+ 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(!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);
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
- try_outgoing_connections(mesh);
+ if(setns(mesh->netns, CLONE_NEWNET) != 0) {
+ pthread_cond_signal(&mesh->cond);
+ return NULL;
+ }
+
+#else
+ pthread_cond_signal(&mesh->cond);
+ return NULL;
+#endif // HAVE_SETNS
+ }
+
+#if HAVE_CATTA
+
+ if(mesh->discovery) {
+ discovery_start(mesh);
+ }
+
+#endif
+
+ pthread_mutex_lock(&(mesh->mesh_mutex));
logger(mesh, MESHLINK_DEBUG, "Starting main_loop...\n");
+ pthread_cond_broadcast(&mesh->cond);
main_loop(mesh);
logger(mesh, MESHLINK_DEBUG, "main_loop returned.\n");
pthread_mutex_unlock(&(mesh->mesh_mutex));
+
+#if HAVE_CATTA
+
+ // Stop discovery
+ if(mesh->discovery) {
+ discovery_stop(mesh);
+ }
+
+#endif
+
return NULL;
}
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));
+ assert(mesh->self->ecdsa);
+ assert(!memcmp((uint8_t *)mesh->self->ecdsa + 64, (uint8_t *)mesh->private_key + 64, 32));
+
if(mesh->threadstarted) {
logger(mesh, MESHLINK_DEBUG, "thread was already running\n");
pthread_mutex_unlock(&(mesh->mesh_mutex));
return false;
}
+ init_outgoings(mesh);
+
// Start the main thread
event_loop_start(&mesh->loop);
logger(mesh, MESHLINK_DEBUG, "Could not start thread: %s\n", strerror(errno));
memset(&mesh->thread, 0, sizeof(mesh)->thread);
meshlink_errno = MESHLINK_EINTERNAL;
+ event_loop_stop(&mesh->loop);
pthread_mutex_unlock(&(mesh->mesh_mutex));
return false;
}
+ pthread_cond_wait(&mesh->cond, &mesh->mesh_mutex);
mesh->threadstarted = true;
- if(mesh->discovery) {
- discovery_start(mesh);
- }
-
pthread_mutex_unlock(&(mesh->mesh_mutex));
return true;
}
pthread_mutex_lock(&(mesh->mesh_mutex));
logger(mesh, MESHLINK_DEBUG, "meshlink_stop called\n");
- // Stop discovery
- if(mesh->discovery) {
- discovery_stop(mesh);
- }
-
// Shut down the main thread
event_loop_stop(&mesh->loop);
// Send ourselves a UDP packet to kick the event loop
- listen_socket_t *s = &mesh->listen_socket[0];
+ for(int i = 0; i < mesh->listen_sockets; i++) {
+ sockaddr_t sa;
+ socklen_t salen = sizeof(sa.sa);
- if(sendto(s->udp.fd, "", 1, MSG_NOSIGNAL, &s->sa.sa, SALEN(s->sa.sa)) == -1) {
- logger(mesh, MESHLINK_ERROR, "Could not send a UDP packet to ourself");
+ 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));
+ }
}
- // Wait for the main thread to finish
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- pthread_join(mesh->thread, NULL);
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ 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;
+ mesh->threadstarted = false;
+ }
// Close all metaconnections
if(mesh->connections) {
}
}
- if(mesh->outgoings) {
- list_delete_list(mesh->outgoings);
- }
+ exit_outgoings(mesh);
- mesh->outgoings = NULL;
+ // 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;
+ }
+ }
+ }
pthread_mutex_unlock(&(mesh->mesh_mutex));
}
void meshlink_close(meshlink_handle_t *mesh) {
- if(!mesh || !mesh->confbase) {
+ if(!mesh) {
meshlink_errno = MESHLINK_EINVAL;
return;
}
logger(mesh, MESHLINK_INFO, "Terminating");
- exit_configuration(&mesh->config);
event_loop_exit(&mesh->loop);
#ifdef HAVE_MINGW
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));
-
- free(mesh);
-}
-
-static void deltree(const char *dirname) {
- DIR *d = opendir(dirname);
-
- if(d) {
- struct dirent *ent;
-
- while((ent = readdir(d))) {
- if(ent->d_name[0] == '.') {
- continue;
- }
-
- char filename[PATH_MAX];
- snprintf(filename, sizeof(filename), "%s" SLASH "%s", dirname, ent->d_name);
-
- if(unlink(filename)) {
- deltree(filename);
- }
- }
+ main_config_unlock(mesh);
- closedir(d);
- }
+ memset(mesh, 0, sizeof(*mesh));
- rmdir(dirname);
- return;
+ free(mesh);
}
bool meshlink_destroy(const char *confbase) {
return false;
}
- char filename[PATH_MAX];
- snprintf(filename, sizeof(filename), "%s" SLASH "meshlink.conf", confbase);
-
- if(unlink(filename)) {
- if(errno == ENOENT) {
- meshlink_errno = MESHLINK_ENOENT;
- return false;
- } else {
- logger(NULL, MESHLINK_ERROR, "Cannot delete %s: %s\n", filename, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- return false;
- }
+ if(!config_destroy(confbase, "current")) {
+ logger(NULL, MESHLINK_ERROR, "Cannot remove confbase sub-directories %s: %s\n", confbase, strerror(errno));
+ return false;
}
- deltree(confbase);
+ 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;
}
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;
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));
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));
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;
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 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;
+ }
+
+ return meshlink_get_all_nodes_by_condition(mesh, submesh, nodes, nmemb, search_node_by_submesh);
+}
+
+dev_class_t meshlink_get_node_dev_class(meshlink_handle_t *mesh, meshlink_node_t *node) {
+ if(!mesh || !node) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return -1;
+ }
+
+ dev_class_t devclass;
+
+ pthread_mutex_lock(&(mesh->mesh_mutex));
+
+ devclass = ((node_t *)node)->devclass;
+
+ pthread_mutex_unlock(&(mesh->mesh_mutex));
+
+ return devclass;
+}
+
+meshlink_submesh_t *meshlink_get_node_submesh(meshlink_handle_t *mesh, meshlink_node_t *node) {
+ if(!mesh || !node) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return NULL;
+ }
+
+ node_t *n = (node_t *)node;
+
+ meshlink_submesh_t *s;
+
+ s = (meshlink_submesh_t *)n->submesh;
+
+ return s;
+}
+
bool meshlink_sign(meshlink_handle_t *mesh, const void *data, size_t len, void *signature, size_t *siglen) {
if(!mesh || !data || !len || !signature || !siglen) {
meshlink_errno = MESHLINK_EINVAL;
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;
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 {
}
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;
- }
-
- // Count the number of valid invitations, clean up old ones
- DIR *dir = opendir(filename);
-
- if(!dir) {
- logger(mesh, MESHLINK_DEBUG, "Could not read directory %s: %s\n", filename, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return false;
- }
-
- 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;
-
- if(snprintf(invname, sizeof(invname), "%s" SLASH "%s", filename, ent->d_name) >= PATH_MAX) {
- logger(mesh, MESHLINK_DEBUG, "Filename too long: %s" SLASH "%s", filename, ent->d_name);
- continue;
- }
-
- if(!stat(invname, &st)) {
- if(mesh->invitation_key && deadline < st.st_mtime) {
- count++;
- } else {
- unlink(invname);
- }
- } else {
- logger(mesh, MESHLINK_DEBUG, "Could not stat %s: %s\n", invname, strerror(errno));
- errno = 0;
- }
- }
-
- 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));
- return false;
- }
-
- closedir(dir);
-
- snprintf(filename, sizeof(filename), "%s" SLASH "invitations" SLASH "ecdsa_key.priv", mesh->confbase);
+ size_t count = invitation_purge_old(mesh, time(NULL) - mesh->invitation_timeout);
- // Remove the key if there are no outstanding invitations.
if(!count) {
- unlink(filename);
-
- if(mesh->invitation_key) {
- ecdsa_free(mesh->invitation_key);
- mesh->invitation_key = NULL;
- }
- }
-
- if(mesh->invitation_key) {
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return true;
- }
-
- // Create a new key if necessary.
- FILE *f = fopen(filename, "rb");
-
- if(!f) {
- if(errno != ENOENT) {
- logger(mesh, MESHLINK_DEBUG, "Could not read %s: %s\n", filename, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return false;
- }
-
- mesh->invitation_key = ecdsa_generate();
-
- if(!mesh->invitation_key) {
- logger(mesh, MESHLINK_DEBUG, "Could not generate a new key!\n");
- meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return false;
- }
-
- f = fopen(filename, "wb");
-
- if(!f) {
- logger(mesh, MESHLINK_DEBUG, "Could not write %s: %s\n", filename, strerror(errno));
- meshlink_errno = MESHLINK_ESTORAGE;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return false;
- }
-
- chmod(filename, 0600);
- ecdsa_write_pem_private_key(mesh->invitation_key, f);
- fclose(f);
- } else {
- mesh->invitation_key = ecdsa_read_pem_private_key(f);
- fclose(f);
-
- if(!mesh->invitation_key) {
- logger(mesh, MESHLINK_DEBUG, "Could not read private key from %s\n", filename);
- meshlink_errno = MESHLINK_ESTORAGE;
- }
+ // TODO: Update invitation key if necessary?
}
pthread_mutex_unlock(&(mesh->mesh_mutex));
+
return mesh->invitation_key;
}
-bool meshlink_add_address(meshlink_handle_t *mesh, const char *address) {
- if(!mesh || !address) {
+bool meshlink_set_canonical_address(meshlink_handle_t *mesh, meshlink_node_t *node, const char *address, const char *port) {
+ if(!mesh || !node || !address) {
meshlink_errno = MESHLINK_EINVAL;
return false;
}
return false;
}
- bool rval = false;
+ if(port && !is_valid_port(port)) {
+ logger(mesh, MESHLINK_DEBUG, "Invalid character in port: %s\n", address);
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ char *canonical_address;
+
+ if(port) {
+ xasprintf(&canonical_address, "%s %s", address, port);
+ } else {
+ canonical_address = xstrdup(address);
+ }
pthread_mutex_lock(&(mesh->mesh_mutex));
- rval = append_config_file(mesh, mesh->self->name, "Address", address);
+
+ 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 rval;
+ 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) {
return false;
}
- bool rval = false;
-
- pthread_mutex_lock(&(mesh->mesh_mutex));
- rval = append_config_file(mesh, mesh->self->name, "Address", address);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
-
+ bool rval = meshlink_add_address(mesh, address);
free(address);
+
return rval;
}
return false;
}
+ devtool_trybind_probe();
+
bool rval = false;
pthread_mutex_lock(&(mesh->mesh_mutex));
goto done;
}
- close_network_connections(mesh);
- exit_configuration(&mesh->config);
+ free(mesh->myport);
+ xasprintf(&mesh->myport, "%d", port);
- char portstr[10];
- snprintf(portstr, sizeof(portstr), "%d", port);
- portstr[sizeof(portstr) - 1] = 0;
+ /* Write meshlink.conf with the updated port number */
+ write_main_config_files(mesh);
- modify_config_file(mesh, mesh->name, "Port", portstr, true);
+ /* Close down the network. This also deletes mesh->self. */
+ close_network_connections(mesh);
- init_configuration(&mesh->config);
+ /* Recreate mesh->self. */
+ mesh->self = new_node();
+ mesh->self->name = xstrdup(mesh->name);
+ mesh->self->devclass = mesh->devclass;
+ xasprintf(&mesh->myport, "%d", port);
- if(!read_server_config(mesh)) {
+ 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 {
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
}
// 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));
}
// 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");
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);
+ /* Construct the invitation file */
+ uint8_t outbuf[4096];
+ packmsg_output_t inv = {outbuf, sizeof(outbuf)};
- 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;
- }
+ 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? */
- FILE *f = fdopen(ifd, "w");
+ /* 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(!f) {
- abort();
+ if(config_read(mesh, "current", mesh->self->name, &configs[count], mesh->config_key)) {
+ count++;
}
- // 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);
+ /* Append host config files to the invitation file */
+ packmsg_add_array(&inv, count);
- // 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);
+ for(int i = 0; i < count; i++) {
+ packmsg_add_bin(&inv, configs[i].buf, configs[i].len);
+ config_free(&configs[i]);
+ }
- // Make sure there is a newline character.
- if(!strchr(buf, '\n')) {
- fputc('\n', f);
- }
- }
- }
+ config_t config = {outbuf, packmsg_output_size(&inv, outbuf)};
- fclose(tc);
- } else {
- logger(mesh, MESHLINK_DEBUG, "Could not create %s: %s\n", filename, strerror(errno));
+ 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);
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_DEBUG, "Already connected to a mesh\n");
+ 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;
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, '/');
}
char *address = copy;
- char *port = strrchr(address, ':');
-
- if(!port) {
- goto invalid;
- }
-
- *port++ = 0;
+ char *port = NULL;
if(!b64decode(slash, mesh->hash, 18) || !b64decode(slash + 24, mesh->cookie, 18)) {
goto invalid;
*comma++ = 0;
}
+ // 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++;
*bracket++ = 0;
- if(comma && bracket != comma) {
+ if(*bracket) {
goto invalid;
}
}
if(ai) {
for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
- mesh->sock = socket(aip->ai_family, aip->ai_socktype, aip->ai_protocol);
+ 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));
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;
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");
+ 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 : "");
- 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));
+ 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);
+ 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(fread(buf + len - fsize - 1, fsize, 1, f) != 1) {
- logger(mesh, MESHLINK_DEBUG, "Error reading from %s: %s\n", filename, strerror(errno));
- fclose(f);
- free(buf);
- meshlink_errno = MESHLINK_ESTORAGE;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ 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;
+ b64encode_urlsafe(buf2, (char *)buf2, packmsg_output_size(&out2, buf2));
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return buf;
+ return (char *)buf2;
}
bool meshlink_import(meshlink_handle_t *mesh, const char *data) {
return false;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ size_t datalen = strlen(data);
+ uint8_t *buf = xmalloc(datalen);
+ int buflen = b64decode(data, buf, datalen);
- if(strncmp(data, "Name = ", 7)) {
+ 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');
+ packmsg_input_t in = {buf, buflen};
+ uint32_t count = packmsg_get_array(&in);
- if(!end) {
+ 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;
+ pthread_mutex_lock(&(mesh->mesh_mutex));
- if(!check_id(name)) {
- logger(mesh, MESHLINK_DEBUG, "Invalid Name\n");
- meshlink_errno = MESHLINK_EPEER;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return false;
- }
+ while(count--) {
+ const void *data;
+ uint32_t len = packmsg_get_bin_raw(&in, &data);
- char filename[PATH_MAX];
- snprintf(filename, sizeof(filename), "%s" SLASH "hosts" SLASH "%s", mesh->confbase, name);
+ if(!len) {
+ break;
+ }
- 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;
- }
+ packmsg_input_t in2 = {data, len};
+ uint32_t version = packmsg_get_uint32(&in2);
+ char *name = packmsg_get_str_dup(&in2);
- 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(!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;
+ }
- FILE *f = fopen(filename, "w");
+ node_t *n = lookup_node(mesh, name);
- 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;
- }
+ 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;
}
node_t *n;
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);
- //Make blacklisting persistent in the config file
- append_config_file(mesh, n->name, "blacklisted", "yes");
+ //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);
+
+ 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) {
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_hint_address(meshlink_handle_t *mesh, meshlink_node_t *node, const struct sockaddr *addr) {
if(!mesh || !node || !addr) {
- return;
- }
-
- // Ignore hints about ourself.
- if((node_t *)node == mesh->self) {
+ 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)) {
- modify_config_file(mesh, node->name, "Address", str, 5);
- } else {
- logger(mesh, MESHLINK_DEBUG, "Not adding Link Local IPv6 Address to config\n");
- }
- }
-
- free(str);
- free(host);
- free(port);
+ 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));
// @TODO do we want to fire off a connection attempt right away?
if(n->status.destroyed) {
meshlink_channel_close(mesh, channel);
- } else if(channel->receive_cb) {
- channel->receive_cb(mesh, channel, data, len);
+ return len;
+ }
+
+ const char *p = data;
+ size_t left = len;
+
+ while(channel->aio_receive) {
+ meshlink_aio_buffer_t *aio = channel->aio_receive;
+ size_t todo = aio->len - aio->done;
+
+ if(todo > left) {
+ todo = left;
+ }
+
+ memcpy((char *)aio->data + aio->done, p, todo);
+ aio->done += todo;
+
+ if(aio->done == aio->len) {
+ channel->aio_receive = aio->next;
+
+ if(aio->cb) {
+ aio->cb(mesh, channel, aio->data, aio->len, aio->priv);
+ }
+
+ free(aio);
+ }
+
+ p += todo;
+ left -= todo;
+
+ if(!left && len) {
+ return len;
+ }
+ }
+
+ if(channel->receive_cb) {
+ channel->receive_cb(mesh, channel, p, left);
}
return len;
static ssize_t channel_send(struct utcp *utcp, const void *data, size_t len) {
node_t *n = utcp->priv;
+
+ if(n->status.destroyed) {
+ return -1;
+ }
+
meshlink_handle_t *mesh = n->mesh;
return meshlink_send(mesh, (meshlink_node_t *)n, data, len) ? (ssize_t)len : -1;
}
node_t *n = channel->node;
meshlink_handle_t *mesh = n->mesh;
+ meshlink_aio_buffer_t *aio = channel->aio_send;
+
+ if(aio) {
+ /* We at least one AIO buffer. Send as much as possible form the first buffer. */
+ size_t left = aio->len - aio->done;
+
+ if(len > left) {
+ len = left;
+ }
+
+ ssize_t sent = utcp_send(connection, (char *)aio->data + aio->done, len);
+
+ if(sent >= 0) {
+ aio->done += sent;
+ }
- if(channel->poll_cb) {
- channel->poll_cb(mesh, channel, len);
+ /* If the buffer is now completely sent, call the callback and dispose of it. */
+ if(aio->done >= aio->len) {
+ channel->aio_send = aio->next;
+
+ if(aio->cb) {
+ aio->cb(mesh, channel, aio->data, aio->len, aio->priv);
+ }
+
+ free(aio);
+ }
+ } else {
+ if(channel->poll_cb) {
+ channel->poll_cb(mesh, channel, len);
+ } else {
+ utcp_set_poll_cb(connection, NULL);
+ }
}
}
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);
+ utcp_set_poll_cb(channel->c, (cb || channel->aio_send) ? channel_poll : NULL);
}
void meshlink_set_channel_accept_cb(meshlink_handle_t *mesh, meshlink_channel_accept_cb_t cb) {
pthread_mutex_unlock(&mesh->mesh_mutex);
}
+void meshlink_set_channel_sndbuf(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t size) {
+ (void)mesh;
+
+ if(!channel) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&mesh->mesh_mutex);
+ utcp_set_sndbuf(channel->c, size);
+ pthread_mutex_unlock(&mesh->mesh_mutex);
+}
+
+void meshlink_set_channel_rcvbuf(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t size) {
+ (void)mesh;
+
+ if(!channel) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&mesh->mesh_mutex);
+ utcp_set_rcvbuf(channel->c, size);
+ pthread_mutex_unlock(&mesh->mesh_mutex);
+}
+
meshlink_channel_t *meshlink_channel_open_ex(meshlink_handle_t *mesh, meshlink_node_t *node, uint16_t port, meshlink_channel_receive_cb_t cb, const void *data, size_t len, uint32_t flags) {
if(data || len) {
abort(); // TODO: handle non-NULL data
}
}
+ if(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;
}
utcp_close(channel->c);
+
+ /* Clean up any outstanding AIO buffers. */
+ for(meshlink_aio_buffer_t *aio = channel->aio_send, *next; aio; aio = next) {
+ next = aio->next;
+
+ if(aio->cb) {
+ aio->cb(mesh, channel, aio->data, aio->len, aio->priv);
+ }
+
+ free(aio);
+ }
+
+ for(meshlink_aio_buffer_t *aio = channel->aio_receive, *next; aio; aio = next) {
+ next = aio->next;
+
+ if(aio->cb) {
+ aio->cb(mesh, channel, aio->data, aio->len, aio->priv);
+ }
+
+ free(aio);
+ }
+
free(channel);
}
// 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.
+ ssize_t retval;
+
pthread_mutex_lock(&mesh->mesh_mutex);
- ssize_t retval = utcp_send(channel->c, data, len);
+
+ /* Disallow direct calls to utcp_send() while we still have AIO active. */
+ if(channel->aio_send) {
+ retval = 0;
+ } else {
+ retval = utcp_send(channel->c, data, len);
+ }
+
pthread_mutex_unlock(&mesh->mesh_mutex);
if(retval < 0) {
return retval;
}
+bool meshlink_channel_aio_send(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len, meshlink_aio_cb_t cb, void *priv) {
+ if(!mesh || !channel) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ if(!len || !data) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ meshlink_aio_buffer_t *aio = xzalloc(sizeof(*aio));
+ aio->data = data;
+ aio->len = len;
+ aio->cb = cb;
+ aio->priv = priv;
+
+ pthread_mutex_lock(&mesh->mesh_mutex);
+
+ /* Append the AIO buffer descriptor to the end of the chain */
+ meshlink_aio_buffer_t **p = &channel->aio_send;
+
+ while(*p) {
+ p = &(*p)->next;
+ }
+
+ *p = aio;
+
+ /* Ensure the poll callback is set, and call it right now to push data if possible */
+ utcp_set_poll_cb(channel->c, channel_poll);
+ channel_poll(channel->c, len);
+
+ pthread_mutex_unlock(&mesh->mesh_mutex);
+
+ return true;
+}
+
+bool meshlink_channel_aio_receive(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len, meshlink_aio_cb_t cb, void *priv) {
+ if(!mesh || !channel) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ if(!len || !data) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ meshlink_aio_buffer_t *aio = xzalloc(sizeof(*aio));
+ aio->data = data;
+ aio->len = len;
+ aio->cb = cb;
+ aio->priv = priv;
+
+ pthread_mutex_lock(&mesh->mesh_mutex);
+
+ /* Append the AIO buffer descriptor to the end of the chain */
+ meshlink_aio_buffer_t **p = &channel->aio_receive;
+
+ while(*p) {
+ p = &(*p)->next;
+ }
+
+ *p = aio;
+
+ pthread_mutex_unlock(&mesh->mesh_mutex);
+
+ return true;
+}
+
uint32_t meshlink_channel_get_flags(meshlink_handle_t *mesh, meshlink_channel_t *channel) {
if(!mesh || !channel) {
meshlink_errno = MESHLINK_EINVAL;
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) {
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);
+ 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;
end:
pthread_mutex_unlock(&mesh->mesh_mutex);
+#else
+ (void)mesh;
+ (void)enable;
+ meshlink_errno = MESHLINK_ENOTSUP;
+#endif
+}
+
+void handle_network_change(meshlink_handle_t *mesh, bool online) {
+ (void)online;
+
+ if(!mesh->connections) {
+ return;
+ }
+
+ retry(mesh);
}
static void __attribute__((constructor)) meshlink_init(void) {
}
/// Device class traits
-dev_class_traits_t dev_class_traits[_DEV_CLASS_MAX + 1] = {
+const 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