#include "ed25519/sha512.h"
#include "discovery.h"
#include "devtools.h"
+#include "graph.h"
#ifndef MSG_NOSIGNAL
#define MSG_NOSIGNAL 0
// 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) {
+static bool getlocaladdr(char *destaddr, sockaddr_t *sa, socklen_t *salen, int netns) {
struct addrinfo *rai = NULL;
const struct addrinfo hint = {
.ai_family = AF_UNSPEC,
freeaddrinfo(rai);
- if(getsockname(sock, sn, sl)) {
+ if(getsockname(sock, &sa->sa, salen)) {
closesocket(sock);
return false;
}
}
static bool getlocaladdrname(char *destaddr, char *host, socklen_t hostlen, int netns) {
- struct sockaddr_storage sn;
- socklen_t sl = sizeof(sn);
+ sockaddr_t sa;
+ socklen_t salen = sizeof(sa);
- if(!getlocaladdr(destaddr, (struct sockaddr *)&sn, &sl, netns)) {
+ if(!getlocaladdr(destaddr, &sa, &salen, netns)) {
return false;
}
- if(getnameinfo((struct sockaddr *)&sn, sl, host, hostlen, NULL, 0, NI_NUMERICHOST | NI_NUMERICSERV)) {
+ if(getnameinfo(&sa.sa, salen, host, hostlen, NULL, 0, NI_NUMERICHOST | NI_NUMERICSERV)) {
return false;
}
}
char *meshlink_get_external_address_for_family(meshlink_handle_t *mesh, int family) {
- char *hostname = NULL;
+ const char *url = mesh->external_address_url;
+
+ if(!url) {
+ url = "http://meshlink.io/host.cgi";
+ }
+
+ /* Find the hostname part between the slashes */
+ if(strncmp(url, "http://", 7)) {
+ abort();
+ meshlink_errno = MESHLINK_EINTERNAL;
+ return NULL;
+ }
+
+ const char *begin = url + 7;
+
+ const char *end = strchr(begin, '/');
+
+ if(!end) {
+ end = begin + strlen(begin);
+ }
+
+ /* Make a copy */
+ char host[end - begin + 1];
+ strncpy(host, begin, end - begin);
+ host[end - begin] = 0;
+
+ char *port = strchr(host, ':');
+
+ if(port) {
+ *port++ = 0;
+ }
logger(mesh, MESHLINK_DEBUG, "Trying to discover externally visible hostname...\n");
- struct addrinfo *ai = str2addrinfo("meshlink.io", "80", SOCK_STREAM);
- static const char request[] = "GET http://www.meshlink.io/host.cgi HTTP/1.0\r\n\r\n";
+ struct addrinfo *ai = str2addrinfo(host, port ? port : "80", SOCK_STREAM);
char line[256];
+ char *hostname = NULL;
for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
if(family != AF_UNSPEC && aip->ai_family != family) {
}
if(s >= 0) {
- send(s, request, sizeof(request) - 1, 0);
+ send(s, "GET ", 4, 0);
+ send(s, url, strlen(url), 0);
+ send(s, " HTTP/1.0\r\n\r\n", 13, 0);
int len = recv(s, line, sizeof(line) - 1, MSG_WAITALL);
if(len > 0) {
return hostname;
}
+static bool is_localaddr(sockaddr_t *sa) {
+ switch(sa->sa.sa_family) {
+ case AF_INET:
+ return *(uint8_t *)(&sa->in.sin_addr.s_addr) == 127;
+
+ case AF_INET6: {
+ uint16_t first = sa->in6.sin6_addr.s6_addr[0] << 8 | sa->in6.sin6_addr.s6_addr[1];
+ return first == 0 || (first & 0xffc0) == 0xfe80;
+ }
+
+ default:
+ return false;
+ }
+}
+
char *meshlink_get_local_address_for_family(meshlink_handle_t *mesh, int family) {
(void)mesh;
success = getlocaladdrname("2606:2800:220:1:248:1893:25c8:1946", localaddr, sizeof(localaddr), mesh->netns);
}
+#ifdef HAVE_GETIFADDRS
+
+ if(!success) {
+ struct ifaddrs *ifa = NULL;
+ getifaddrs(&ifa);
+
+ for(struct ifaddrs *ifap = ifa; ifap; ifap = ifap->ifa_next) {
+ sockaddr_t *sa = (sockaddr_t *)ifap->ifa_addr;
+
+ if(sa->sa.sa_family != family) {
+ continue;
+ }
+
+ if(is_localaddr(sa)) {
+ continue;
+ }
+
+ if(!getnameinfo(&sa->sa, SALEN(sa->sa), localaddr, sizeof(localaddr), NULL, 0, NI_NUMERICHOST | NI_NUMERICSERV)) {
+ success = true;
+ break;
+ }
+ }
+
+ freeifaddrs(ifa);
+ }
+
+#endif
+
if(!success) {
meshlink_errno = MESHLINK_ENETWORK;
return NULL;
break;
}
- if(found) {
+ if(found || !is_valid_hostname(host[i])) {
free(host[i]);
free(port[i]);
host[i] = 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};
+ int count = 4 + (mesh->invitation_addresses ? mesh->invitation_addresses->count : 0);
+ int n = 0;
+ char *hostname[count];
+ char *port[count];
char *hostport = NULL;
+ memset(hostname, 0, sizeof(hostname));
+ memset(port, 0, sizeof(port));
+
if(!(flags & (MESHLINK_INVITE_LOCAL | MESHLINK_INVITE_PUBLIC))) {
flags |= MESHLINK_INVITE_LOCAL | MESHLINK_INVITE_PUBLIC;
}
flags |= MESHLINK_INVITE_IPV4 | MESHLINK_INVITE_IPV6;
}
+ // Add all explicitly set invitation addresses
+ if(mesh->invitation_addresses) {
+ for list_each(char, combo, mesh->invitation_addresses) {
+ hostname[n] = xstrdup(combo);
+ char *slash = strrchr(hostname[n], '/');
+
+ if(slash) {
+ *slash = 0;
+ port[n] = xstrdup(slash + 1);
+ }
+
+ n++;
+ }
+ }
+
// 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);
+ hostname[n++] = meshlink_get_local_address_for_family(mesh, AF_INET);
}
if(flags & MESHLINK_INVITE_IPV6) {
- hostname[1] = meshlink_get_local_address_for_family(mesh, AF_INET6);
+ hostname[n++] = meshlink_get_local_address_for_family(mesh, AF_INET6);
}
}
// Add public/canonical addresses if requested
if(flags & MESHLINK_INVITE_PUBLIC) {
// Try the CanonicalAddress first
- get_canonical_address(mesh->self, &hostname[2], &port[2]);
+ get_canonical_address(mesh->self, &hostname[n], &port[n]);
- if(!hostname[2]) {
+ if(!hostname[n] && count == 4) {
if(flags & MESHLINK_INVITE_IPV4) {
- hostname[2] = meshlink_get_external_address_for_family(mesh, AF_INET);
+ hostname[n++] = 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);
+ hostname[n++] = meshlink_get_external_address_for_family(mesh, AF_INET6);
}
+ } else {
+ n++;
}
}
- for(int i = 0; i < 4; i++) {
+ for(int i = 0; i < n; i++) {
// Ensure we always have a port number
if(hostname[i] && !port[i]) {
port[i] = xstrdup(mesh->myport);
}
}
- remove_duplicate_hostnames(hostname, port, 4);
+ remove_duplicate_hostnames(hostname, port, n);
- if(!(flags & MESHLINK_INVITE_NUMERIC)) {
- for(int i = 0; i < 4; i++) {
- if(!hostname[i]) {
- continue;
- }
+ // Resolve the hostnames
+ for(int i = 0; i < n; i++) {
+ if(!hostname[i]) {
+ continue;
+ }
- // 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);
+ // 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);
- if(err || !ai_in) {
- continue;
- }
+ if(err || !ai_in) {
+ continue;
+ }
- // 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);
+ // Remember the address(es)
+ for(struct addrinfo *aip = ai_in; aip; aip = aip->ai_next) {
+ node_add_recent_address(mesh, mesh->self, (sockaddr_t *)aip->ai_addr);
+ }
- if(err) {
- freeaddrinfo(ai_in);
- continue;
- }
+ if(flags & MESHLINK_INVITE_NUMERIC) {
+ // We don't need to do any further conversion
+ 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);
+ // 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 || !ai_out) {
- freeaddrinfo(ai_in);
- continue;
- }
+ if(err || !is_valid_hostname(resolved_host)) {
+ 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;
- }
+ // Convert the hostname back to a sockaddr
+ hint.ai_family = ai_in->ai_family;
+ err = getaddrinfo(resolved_host, resolved_port, &hint, &ai_out);
- // Yes: replace the hostname with the resolved one
- free(hostname[i]);
- hostname[i] = xstrdup(resolved_host);
+ 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);
+ remove_duplicate_hostnames(hostname, port, n);
// Concatenate all unique address to the hostport string
- for(int i = 0; i < 4; i++) {
+ for(int i = 0; i < n; 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]);
return hostport;
}
-static bool try_bind(int port) {
+static bool try_bind(meshlink_handle_t *mesh, int port) {
struct addrinfo *ai = NULL;
struct addrinfo hint = {
.ai_flags = AI_PASSIVE,
return false;
}
- //while(ai) {
+ bool success = false;
+
for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
- int fd = socket(aip->ai_family, SOCK_STREAM, IPPROTO_TCP);
+ /* Try to bind to TCP. */
- if(!fd) {
- freeaddrinfo(ai);
- return false;
+ int tcp_fd = setup_tcp_listen_socket(mesh, aip);
+
+ if(tcp_fd == -1) {
+ if(errno == EADDRINUSE) {
+ /* If this port is in use for any address family, avoid it. */
+ success = false;
+ break;
+ } else {
+ continue;
+ }
}
- int result = bind(fd, aip->ai_addr, aip->ai_addrlen);
- closesocket(fd);
+ /* If TCP worked, then we require that UDP works as well. */
- if(result) {
- freeaddrinfo(ai);
- return false;
+ int udp_fd = setup_udp_listen_socket(mesh, aip);
+
+ if(udp_fd == -1) {
+ closesocket(tcp_fd);
+ success = false;
+ break;
}
+
+ closesocket(tcp_fd);
+ closesocket(udp_fd);
+ success = true;
}
freeaddrinfo(ai);
- return true;
+ return success;
}
int check_port(meshlink_handle_t *mesh) {
for(int i = 0; i < 1000; i++) {
- int port = 0x1000 + (rand() & 0x7fff);
+ int port = 0x1000 + prng(mesh, 0x8000);
- if(try_bind(port)) {
+ if(try_bind(mesh, port)) {
free(mesh->myport);
xasprintf(&mesh->myport, "%d", port);
return port;
return true;
}
-static bool finalize_join(meshlink_handle_t *mesh, const void *buf, uint16_t len) {
+typedef struct {
+ meshlink_handle_t *mesh;
+ int sock;
+ char cookie[18 + 32];
+ char hash[18];
+ bool success;
+ sptps_t sptps;
+ char *data;
+ size_t thedatalen;
+ size_t blen;
+ char line[4096];
+ char buffer[4096];
+} join_state_t;
+
+static bool finalize_join(join_state_t *state, const void *buf, uint16_t len) {
+ meshlink_handle_t *mesh = state->mesh;
packmsg_input_t in = {buf, len};
uint32_t version = packmsg_get_uint32(&in);
char *name = packmsg_get_str_dup(&in);
packmsg_skip_element(&in); /* submesh */
- int32_t devclass = packmsg_get_int32(&in);
+ dev_class_t devclass = packmsg_get_int32(&in);
uint32_t count = packmsg_get_array(&in);
if(!name) {
free(mesh->self->name);
mesh->name = name;
mesh->self->name = xstrdup(name);
- mesh->self->devclass = devclass;
+ mesh->self->devclass = devclass == DEV_CLASS_UNKNOWN ? mesh->devclass : devclass;
// Initialize configuration directory
if(!config_init(mesh, "current")) {
}
// Write host config files
- while(count--) {
+ for(uint32_t i = 0; i < count; i++) {
const void *data;
uint32_t len = packmsg_get_bin_raw(&in, &data);
return false;
}
- node_add(mesh, n);
+ if(i == 0) {
+ /* The first host config file is of the inviter itself;
+ * remember the address we are currently using for the invitation connection.
+ */
+ sockaddr_t sa;
+ socklen_t salen = sizeof(sa);
+
+ if(getpeername(state->sock, &sa.sa, &salen) == 0) {
+ node_add_recent_address(mesh, n, &sa);
+ }
+ }
- if(!config_write(mesh, "current", n->name, &config, mesh->config_key)) {
+ /* Clear the reachability times, since we ourself have never seen these nodes yet */
+ n->last_reachable = 0;
+ n->last_unreachable = 0;
+
+ if(!node_write_config(mesh, n)) {
+ free_node(n);
return false;
}
+
+ node_add(mesh, n);
+ }
+
+ /* Ensure the configuration directory metadata is on disk */
+ if(!config_sync(mesh, "current") || !sync_path(mesh->confbase)) {
+ return false;
+ }
+
+ if(!mesh->inviter_commits_first) {
+ devtool_set_inviter_commits_first(false);
}
- sptps_send_record(&(mesh->sptps), 1, ecdsa_get_public_key(mesh->private_key), 32);
+ sptps_send_record(&state->sptps, 1, ecdsa_get_public_key(mesh->private_key), 32);
logger(mesh, MESHLINK_DEBUG, "Configuration stored in: %s\n", mesh->confbase);
static bool invitation_send(void *handle, uint8_t type, const void *data, size_t len) {
(void)type;
- meshlink_handle_t *mesh = handle;
+ join_state_t *state = handle;
const char *ptr = data;
while(len) {
- int result = send(mesh->sock, ptr, len, 0);
+ int result = send(state->sock, ptr, len, 0);
if(result == -1 && errno == EINTR) {
continue;
}
static bool invitation_receive(void *handle, uint8_t type, const void *msg, uint16_t len) {
- meshlink_handle_t *mesh = handle;
+ join_state_t *state = handle;
+ meshlink_handle_t *mesh = state->mesh;
- switch(type) {
- case SPTPS_HANDSHAKE:
- return sptps_send_record(&(mesh->sptps), 0, mesh->cookie, sizeof(mesh)->cookie);
+ if(mesh->inviter_commits_first) {
+ switch(type) {
+ case SPTPS_HANDSHAKE:
+ return sptps_send_record(&state->sptps, 2, state->cookie, 18 + 32);
- case 0:
- return finalize_join(mesh, msg, len);
+ case 1:
+ break;
- case 1:
- logger(mesh, MESHLINK_DEBUG, "Invitation succesfully accepted.\n");
- shutdown(mesh->sock, SHUT_RDWR);
- mesh->success = true;
- break;
+ case 0:
+ if(!finalize_join(state, msg, len)) {
+ return false;
+ }
- default:
- return false;
+ logger(mesh, MESHLINK_DEBUG, "Invitation successfully accepted.\n");
+ shutdown(state->sock, SHUT_RDWR);
+ state->success = true;
+ break;
+
+ default:
+ return false;
+ }
+ } else {
+ switch(type) {
+ case SPTPS_HANDSHAKE:
+ return sptps_send_record(&state->sptps, 0, state->cookie, 18);
+
+ case 0:
+ return finalize_join(state, msg, len);
+
+ case 1:
+ logger(mesh, MESHLINK_DEBUG, "Invitation successfully accepted.\n");
+ shutdown(state->sock, SHUT_RDWR);
+ state->success = true;
+ break;
+
+ default:
+ return false;
+ }
}
return true;
}
-static bool recvline(meshlink_handle_t *mesh, size_t len) {
+static bool recvline(join_state_t *state) {
char *newline = NULL;
- 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);
+ while(!(newline = memchr(state->buffer, '\n', state->blen))) {
+ int result = recv(state->sock, state->buffer + state->blen, sizeof(state)->buffer - state->blen, 0);
if(result == -1 && errno == EINTR) {
continue;
return false;
}
- mesh->blen += result;
+ state->blen += result;
}
- if((size_t)(newline - mesh->buffer) >= len) {
+ if((size_t)(newline - state->buffer) >= sizeof(state->line)) {
return false;
}
- len = newline - mesh->buffer;
+ size_t len = newline - state->buffer;
- memcpy(mesh->line, mesh->buffer, len);
- mesh->line[len] = 0;
- memmove(mesh->buffer, newline + 1, mesh->blen - len - 1);
- mesh->blen -= len + 1;
+ memcpy(state->line, state->buffer, len);
+ state->line[len] = 0;
+ memmove(state->buffer, newline + 1, state->blen - len - 1);
+ state->blen -= len + 1;
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_EPEER] = "Error communicating with peer",
[MESHLINK_ENOTSUP] = "Operation not supported",
[MESHLINK_EBUSY] = "MeshLink instance already in use",
+ [MESHLINK_EBLACKLISTED] = "Node is blacklisted",
};
const char *meshlink_strerror(meshlink_errno_t err) {
// 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);
+ sockaddr_t sa;
+ sa.storage.ss_family = AF_UNKNOWN;
+ socklen_t salen = sizeof(sa);
// IPv4 example.org
- 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);
+ if(getlocaladdr("93.184.216.34", &sa, &salen, mesh->netns)) {
+ sa.in.sin_port = ntohs(atoi(mesh->myport));
+ node_add_recent_address(mesh, mesh->self, &sa);
}
// IPv6 example.org
- sl = sizeof(sn);
+ salen = sizeof(sa);
- 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);
+ if(getlocaladdr("2606:2800:220:1:248:1893:25c8:1946", &sa, &salen, mesh->netns)) {
+ sa.in6.sin6_port = ntohs(atoi(mesh->myport));
+ node_add_recent_address(mesh, mesh->self, &sa);
}
}
static bool meshlink_setup(meshlink_handle_t *mesh) {
+ if(!config_destroy(mesh->confbase, "new")) {
+ logger(mesh, MESHLINK_ERROR, "Could not delete configuration in %s/new: %s\n", mesh->confbase, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
+ }
+
+ if(!config_destroy(mesh->confbase, "old")) {
+ logger(mesh, MESHLINK_ERROR, "Could not delete configuration in %s/old: %s\n", mesh->confbase, strerror(errno));
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
+ }
+
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;
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));
+ mesh->self->session_id = mesh->session_id;
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));
return false;
}
- if(!main_config_lock(mesh)) {
- logger(NULL, MESHLINK_ERROR, "Cannot lock main config file\n");
- meshlink_errno = MESHLINK_ESTORAGE;
+ /* Ensure the configuration directory metadata is on disk */
+ if(!config_sync(mesh, "current")) {
return false;
}
}
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)) {
mesh->self = new_node();
mesh->self->name = xstrdup(name);
mesh->self->devclass = mesh->devclass;
+ mesh->self->session_id = mesh->session_id;
if(!node_read_public_key(mesh, mesh->self)) {
logger(NULL, MESHLINK_ERROR, "Could not read our host configuration file!");
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;
- }
+ meshlink_errno = MESHLINK_EINVAL;
+ return 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) {
+ if(devclass < 0 || devclass >= DEV_CLASS_COUNT) {
logger(NULL, MESHLINK_ERROR, "Invalid devclass given!\n");
meshlink_errno = MESHLINK_EINVAL;
return NULL;
return true;
}
-bool meshlink_encrypted_key_rotate(meshlink_handle_t *mesh, const char *new_key, size_t new_keylen) {
- if(!mesh || !new_key || !new_keylen || !*new_key) {
+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));
+ pthread_mutex_lock(&mesh->mutex);
// Create hash for the new key
void *new_config_key;
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));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
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));
+ pthread_mutex_unlock(&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));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
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));
+ pthread_mutex_unlock(&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));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
free(mesh->config_key);
mesh->config_key = new_config_key;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return true;
}
free(params);
}
+/// Device class traits
+static const dev_class_traits_t default_class_traits[DEV_CLASS_COUNT] = {
+ { .pingtimeout = 5, .pinginterval = 60, .min_connects = 3, .max_connects = 10000, .edge_weight = 1 }, // DEV_CLASS_BACKBONE
+ { .pingtimeout = 5, .pinginterval = 60, .min_connects = 3, .max_connects = 100, .edge_weight = 3 }, // DEV_CLASS_STATIONARY
+ { .pingtimeout = 5, .pinginterval = 60, .min_connects = 3, .max_connects = 3, .edge_weight = 6 }, // DEV_CLASS_PORTABLE
+ { .pingtimeout = 5, .pinginterval = 60, .min_connects = 1, .max_connects = 1, .edge_weight = 9 }, // DEV_CLASS_UNKNOWN
+};
+
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");
}
/* Create a temporary struct on the stack, to avoid allocating and freeing one. */
- meshlink_open_params_t params = {NULL};
+ meshlink_open_params_t params;
+ memset(¶ms, 0, sizeof(params));
params.confbase = (char *)confbase;
params.name = (char *)name;
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};
+ meshlink_open_params_t params;
+ memset(¶ms, 0, sizeof(params));
params.name = (char *)name;
params.appname = (char *)appname;
}
}
- if((int)params->devclass < 0 || params->devclass > _DEV_CLASS_MAX) {
+ if(params->devclass < 0 || params->devclass >= DEV_CLASS_COUNT) {
logger(NULL, MESHLINK_ERROR, "Invalid devclass given!\n");
meshlink_errno = MESHLINK_EINVAL;
return NULL;
mesh->invitation_timeout = 604800; // 1 week
mesh->netns = params->netns;
mesh->submeshes = NULL;
+ mesh->log_cb = global_log_cb;
+ mesh->log_level = global_log_level;
+
+ randomize(&mesh->prng_state, sizeof(mesh->prng_state));
+
+ do {
+ randomize(&mesh->session_id, sizeof(mesh->session_id));
+ } while(mesh->session_id == 0);
+
+ memcpy(mesh->dev_class_traits, default_class_traits, sizeof(default_class_traits));
if(usingname) {
mesh->name = xstrdup(params->name);
pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
- pthread_mutex_init(&(mesh->mesh_mutex), &attr);
+ pthread_mutex_init(&mesh->mutex, &attr);
mesh->threadstarted = false;
event_loop_init(&mesh->loop);
meshlink_queue_init(&mesh->outpacketqueue);
+ // Atomically lock the configuration directory.
+ if(!main_config_lock(mesh)) {
+ meshlink_close(mesh);
+ return NULL;
+ }
+
// If no configuration exists yet, create it.
if(!meshlink_confbase_exists(mesh)) {
}
add_local_addresses(mesh);
- node_write_config(mesh, mesh->self);
+
+ if(!node_write_config(mesh, mesh->self)) {
+ logger(NULL, MESHLINK_ERROR, "Cannot update configuration\n");
+ return NULL;
+ }
idle_set(&mesh->loop, idle, mesh);
}
//lock mesh->nodes
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
s = (meshlink_submesh_t *)create_submesh(mesh, submesh);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return s;
}
#ifdef HAVE_SETNS
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
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+#if HAVE_CATTA
+
+ if(mesh->discovery) {
+ discovery_start(mesh);
+ }
+
+#endif
+
+ pthread_mutex_lock(&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));
+ pthread_mutex_unlock(&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;
logger(mesh, MESHLINK_DEBUG, "meshlink_start called\n");
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
+
+ assert(mesh->self);
+ assert(mesh->private_key);
+ 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));
+ pthread_mutex_unlock(&mesh->mutex);
return true;
}
return false;
}
- mesh->thedatalen = 0;
-
// TODO: open listening sockets first
//Check that a valid name is set
if(!mesh->name) {
logger(mesh, MESHLINK_DEBUG, "No name given!\n");
meshlink_errno = MESHLINK_EINVAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
memset(&mesh->thread, 0, sizeof(mesh)->thread);
meshlink_errno = MESHLINK_EINTERNAL;
event_loop_stop(&mesh->loop);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
+ pthread_cond_wait(&mesh->cond, &mesh->mutex);
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));
+ // Ensure we are considered reachable
+ graph(mesh);
-
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return true;
}
return;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
logger(mesh, MESHLINK_DEBUG, "meshlink_stop called\n");
-#if HAVE_CATTA
-
- // Stop discovery
- if(mesh->discovery) {
- discovery_stop(mesh);
- }
-
-#endif
-
// Shut down the main thread
event_loop_stop(&mesh->loop);
// 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);
+ socklen_t salen = sizeof(sa);
if(getsockname(mesh->listen_socket[i].udp.fd, &sa.sa, &salen) == -1) {
logger(mesh, MESHLINK_ERROR, "System call `%s' failed: %s", "getsockname", sockstrerror(sockerrno));
if(mesh->threadstarted) {
// Wait for the main thread to finish
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
pthread_join(mesh->thread, NULL);
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
mesh->threadstarted = false;
}
exit_outgoings(mesh);
- // Write out any changed node config files
+ // Ensure we are considered unreachable
+ if(mesh->nodes) {
+ graph(mesh);
+ }
+
+ // Try to write out any changed node config files, ignore errors at this point.
if(mesh->nodes) {
for splay_each(node_t, n, mesh->nodes) {
if(n->status.dirty) {
- node_write_config(mesh, n);
- n->status.dirty = false;
+ n->status.dirty = !node_write_config(mesh, n);
}
}
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
}
void meshlink_close(meshlink_handle_t *mesh) {
meshlink_stop(mesh);
// lock is not released after this
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
// Close and free all resources used.
close(mesh->netns);
}
+ for(vpn_packet_t *packet; (packet = meshlink_queue_pop(&mesh->outpacketqueue));) {
+ free(packet);
+ }
+
+ meshlink_queue_exit(&mesh->outpacketqueue);
+
free(mesh->name);
free(mesh->appname);
free(mesh->confbase);
free(mesh->config_key);
+ free(mesh->external_address_url);
ecdsa_free(mesh->private_key);
- pthread_mutex_destroy(&(mesh->mesh_mutex));
+
+ if(mesh->invitation_addresses) {
+ list_delete_list(mesh->invitation_addresses);
+ }
main_config_unlock(mesh);
+ pthread_mutex_unlock(&mesh->mutex);
+ pthread_mutex_destroy(&mesh->mutex);
+
memset(mesh, 0, sizeof(*mesh));
free(mesh);
return false;
}
- if(!config_destroy(confbase, "current")) {
- logger(NULL, MESHLINK_ERROR, "Cannot remove confbase sub-directories %s: %s\n", confbase, strerror(errno));
- return false;
+ /* Exit early if the confbase directory itself doesn't exist */
+ if(access(confbase, F_OK) && errno == ENOENT) {
+ return true;
}
- config_destroy(confbase, "new");
- config_destroy(confbase, "old");
+ /* Take the lock the same way meshlink_open() would. */
+ char lockfilename[PATH_MAX];
+ snprintf(lockfilename, sizeof(lockfilename), "%s" SLASH "meshlink.lock", confbase);
- if(rmdir(confbase) && errno != ENOENT) {
- logger(NULL, MESHLINK_ERROR, "Cannot remove directory %s: %s\n", confbase, strerror(errno));
+ FILE *lockfile = fopen(lockfilename, "w+");
+
+ if(!lockfile) {
+ logger(NULL, MESHLINK_ERROR, "Could not open lock file %s: %s", lockfilename, strerror(errno));
meshlink_errno = MESHLINK_ESTORAGE;
return false;
}
- return true;
-}
+#ifdef FD_CLOEXEC
+ fcntl(fileno(lockfile), F_SETFD, FD_CLOEXEC);
+#endif
-void meshlink_set_receive_cb(meshlink_handle_t *mesh, meshlink_receive_cb_t cb) {
- if(!mesh) {
- meshlink_errno = MESHLINK_EINVAL;
- return;
+#ifdef HAVE_MINGW
+ // TODO: use _locking()?
+#else
+
+ if(flock(fileno(lockfile), LOCK_EX | LOCK_NB) != 0) {
+ logger(NULL, MESHLINK_ERROR, "Configuration directory %s still in use\n", lockfilename);
+ fclose(lockfile);
+ meshlink_errno = MESHLINK_EBUSY;
+ return false;
+ }
+
+#endif
+
+ if(!config_destroy(confbase, "current") || !config_destroy(confbase, "new") || !config_destroy(confbase, "old")) {
+ logger(NULL, MESHLINK_ERROR, "Cannot remove sub-directories in %s: %s\n", confbase, strerror(errno));
+ return false;
+ }
+
+ if(unlink(lockfilename)) {
+ logger(NULL, MESHLINK_ERROR, "Cannot remove lock file %s: %s\n", lockfilename, strerror(errno));
+ fclose(lockfile);
+ meshlink_errno = MESHLINK_ESTORAGE;
+ return false;
+ }
+
+ fclose(lockfile);
+
+ if(!sync_path(confbase)) {
+ logger(NULL, MESHLINK_ERROR, "Cannot sync 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;
+ return;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
mesh->receive_cb = cb;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
}
void meshlink_set_connection_try_cb(meshlink_handle_t *mesh, meshlink_connection_try_cb_t cb) {
return;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
mesh->connection_try_cb = cb;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
}
void meshlink_set_node_status_cb(meshlink_handle_t *mesh, meshlink_node_status_cb_t cb) {
return;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
mesh->node_status_cb = cb;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
+}
+
+void meshlink_set_node_pmtu_cb(meshlink_handle_t *mesh, meshlink_node_pmtu_cb_t cb) {
+ if(!mesh) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
+ mesh->node_pmtu_cb = cb;
+ pthread_mutex_unlock(&mesh->mutex);
}
void meshlink_set_node_duplicate_cb(meshlink_handle_t *mesh, meshlink_node_duplicate_cb_t cb) {
return;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
mesh->node_duplicate_cb = cb;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&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));
+ pthread_mutex_lock(&mesh->mutex);
mesh->log_cb = cb;
mesh->log_level = cb ? level : 0;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
} else {
global_log_cb = cb;
global_log_level = cb ? level : 0;
}
}
+void meshlink_set_error_cb(struct meshlink_handle *mesh, meshlink_error_cb_t cb) {
+ if(!mesh) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
+ mesh->error_cb = cb;
+ pthread_mutex_unlock(&mesh->mutex);
+}
+
bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, size_t len) {
meshlink_packethdr_t *hdr;
if(n->status.blacklisted) {
logger(mesh, MESHLINK_ERROR, "Node %s blacklisted, dropping packet\n", n->name);
+ meshlink_errno = MESHLINK_EBLACKLISTED;
return false;
}
}
// 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 meshlink_send_from_queue(event_loop_t *loop, void *data) {
(void)loop;
+ meshlink_handle_t *mesh = data;
vpn_packet_t *packet = meshlink_queue_pop(&mesh->outpacketqueue);
if(!packet) {
mesh->self->in_packets++;
mesh->self->in_bytes += packet->len;
route(mesh, mesh->self, packet);
+
+ free(packet);
}
ssize_t meshlink_get_pmtu(meshlink_handle_t *mesh, meshlink_node_t *destination) {
return -1;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
node_t *n = (node_t *)destination;
if(!n->status.reachable) {
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return 0;
} else if(n->mtuprobes > 30 && n->minmtu) {
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return n->minmtu;
} else {
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return MTU;
}
}
return NULL;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
node_t *n = (node_t *)node;
if(!node_read_public_key(mesh, n) || !n->ecdsa) {
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
meshlink_errno = MESHLINK_EINTERNAL;
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return fingerprint;
}
return NULL;
}
- meshlink_node_t *node = NULL;
+ node_t *n = NULL;
+
+ pthread_mutex_lock(&mesh->mutex);
+ n = lookup_node(mesh, (char *)name); // TODO: make lookup_node() use const
+ pthread_mutex_unlock(&mesh->mutex);
- 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;
+ if(!n) {
+ meshlink_errno = MESHLINK_ENOENT;
+ }
+
+ return (meshlink_node_t *)n;
}
meshlink_submesh_t *meshlink_get_submesh(meshlink_handle_t *mesh, const char *name) {
meshlink_submesh_t *submesh = NULL;
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
submesh = (meshlink_submesh_t *)lookup_submesh(mesh, name);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
+
+ if(!submesh) {
+ meshlink_errno = MESHLINK_ENOENT;
+ }
+
return submesh;
}
meshlink_node_t **result;
//lock mesh->nodes
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
*nmemb = mesh->nodes->count;
result = realloc(nodes, *nmemb * sizeof(*nodes));
meshlink_errno = MESHLINK_ENOMEM;
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&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));
+ pthread_mutex_lock(&mesh->mutex);
*nmemb = 0;
for splay_each(node_t, n, mesh->nodes) {
- if(true == search_node(n, condition)) {
- *nmemb = *nmemb + 1;
+ if(search_node(n, condition)) {
+ ++*nmemb;
}
}
if(*nmemb == 0) {
free(nodes);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
meshlink_node_t **p = result;
for splay_each(node_t, n, mesh->nodes) {
- if(true == search_node(n, condition)) {
+ if(search_node(n, condition)) {
*p++ = (meshlink_node_t *)n;
}
}
meshlink_errno = MESHLINK_ENOMEM;
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return result;
}
return false;
}
+struct time_range {
+ time_t start;
+ time_t end;
+};
+
+static bool search_node_by_last_reachable(const node_t *node, const void *condition) {
+ const struct time_range *range = condition;
+ time_t start = node->last_reachable;
+ time_t end = node->last_unreachable;
+
+ if(end < start) {
+ end = time(NULL);
+
+ if(end < start) {
+ start = end;
+ }
+ }
+
+ if(range->end >= range->start) {
+ return start <= range->end && end >= range->start;
+ } else {
+ return start > range->start || end < range->end;
+ }
+}
+
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) {
+ if(!mesh || devclass < 0 || devclass >= DEV_CLASS_COUNT || !nmemb) {
meshlink_errno = MESHLINK_EINVAL;
return NULL;
}
return meshlink_get_all_nodes_by_condition(mesh, submesh, nodes, nmemb, search_node_by_submesh);
}
+meshlink_node_t **meshlink_get_all_nodes_by_last_reachable(meshlink_handle_t *mesh, time_t start, time_t end, meshlink_node_t **nodes, size_t *nmemb) {
+ if(!mesh || !nmemb) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return NULL;
+ }
+
+ struct time_range range = {start, end};
+
+ return meshlink_get_all_nodes_by_condition(mesh, &range, nodes, nmemb, search_node_by_last_reachable);
+}
+
dev_class_t meshlink_get_node_dev_class(meshlink_handle_t *mesh, meshlink_node_t *node) {
if(!mesh || !node) {
meshlink_errno = MESHLINK_EINVAL;
dev_class_t devclass;
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
devclass = ((node_t *)node)->devclass;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return devclass;
}
return s;
}
+bool meshlink_get_node_reachability(struct meshlink_handle *mesh, struct meshlink_node *node, time_t *last_reachable, time_t *last_unreachable) {
+ if(!mesh || !node) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return NULL;
+ }
+
+ node_t *n = (node_t *)node;
+ bool reachable;
+
+ pthread_mutex_lock(&mesh->mutex);
+ reachable = n->status.reachable && !n->status.blacklisted;
+
+ if(last_reachable) {
+ *last_reachable = n->last_reachable;
+ }
+
+ if(last_unreachable) {
+ *last_unreachable = n->last_unreachable;
+ }
+
+ pthread_mutex_unlock(&mesh->mutex);
+
+ return reachable;
+}
+
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;
return false;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
if(!ecdsa_sign(mesh->private_key, data, len, signature)) {
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
*siglen = MESHLINK_SIGLEN;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return true;
}
bool meshlink_verify(meshlink_handle_t *mesh, meshlink_node_t *source, const void *data, size_t len, const void *signature, size_t siglen) {
- if(!mesh || !data || !len || !signature) {
+ if(!mesh || !source || !data || !len || !signature) {
meshlink_errno = MESHLINK_EINVAL;
return false;
}
return false;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
bool rval = false;
rval = ecdsa_verify(((struct node_t *)source)->ecdsa, data, len, signature);
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return rval;
}
static bool refresh_invitation_key(meshlink_handle_t *mesh) {
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
size_t count = invitation_purge_old(mesh, time(NULL) - mesh->invitation_timeout);
// TODO: Update invitation key if necessary?
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return mesh->invitation_key;
}
canonical_address = xstrdup(address);
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&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));
+ if(!node_write_config(mesh, n)) {
+ pthread_mutex_unlock(&mesh->mutex);
+ return false;
+ }
+
+ pthread_mutex_unlock(&mesh->mutex);
+
+ return config_sync(mesh, "current");
+}
+
+bool meshlink_add_invitation_address(struct meshlink_handle *mesh, const char *address, const char *port) {
+ if(!mesh || !address) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ if(!is_valid_hostname(address)) {
+ logger(mesh, MESHLINK_DEBUG, "Invalid character in address: %s\n", address);
+ meshlink_errno = MESHLINK_EINVAL;
+ return 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 *combo;
+
+ if(port) {
+ xasprintf(&combo, "%s/%s", address, port);
+ } else {
+ combo = xstrdup(address);
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
+
+ if(!mesh->invitation_addresses) {
+ mesh->invitation_addresses = list_alloc((list_action_t)free);
+ }
+
+ list_insert_tail(mesh->invitation_addresses, combo);
+ pthread_mutex_unlock(&mesh->mutex);
return true;
}
+void meshlink_clear_invitation_addresses(struct meshlink_handle *mesh) {
+ if(!mesh) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
+
+ if(mesh->invitation_addresses) {
+ list_delete_list(mesh->invitation_addresses);
+ mesh->invitation_addresses = NULL;
+ }
+
+ pthread_mutex_unlock(&mesh->mutex);
+}
+
bool meshlink_add_address(meshlink_handle_t *mesh, const char *address) {
return meshlink_set_canonical_address(mesh, (meshlink_node_t *)mesh->self, address, NULL);
}
return false;
}
- bool rval = meshlink_add_address(mesh, address);
+ bool rval = meshlink_set_canonical_address(mesh, (meshlink_node_t *)mesh->self, address, NULL);
free(address);
return rval;
return -1;
}
- return atoi(mesh->myport);
+ int port;
+
+ pthread_mutex_lock(&mesh->mutex);
+ port = atoi(mesh->myport);
+ pthread_mutex_unlock(&mesh->mutex);
+
+ return port;
}
bool meshlink_set_port(meshlink_handle_t *mesh, int port) {
return true;
}
- if(!try_bind(port)) {
+ if(!try_bind(mesh, port)) {
meshlink_errno = MESHLINK_ENETWORK;
return false;
}
bool rval = false;
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
if(mesh->threadstarted) {
meshlink_errno = MESHLINK_EINVAL;
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);
mesh->self = new_node();
mesh->self->name = xstrdup(mesh->name);
mesh->self->devclass = mesh->devclass;
+ mesh->self->session_id = mesh->session_id;
xasprintf(&mesh->myport, "%d", port);
if(!node_read_public_key(mesh, mesh->self)) {
meshlink_errno = MESHLINK_ESTORAGE;
free_node(mesh->self);
mesh->self = NULL;
+ goto done;
} else if(!setup_network(mesh)) {
meshlink_errno = MESHLINK_ENETWORK;
- } else {
- rval = true;
+ goto done;
}
+ /* Rebuild our own list of recent addresses */
+ memset(mesh->self->recent, 0, sizeof(mesh->self->recent));
+ add_local_addresses(mesh);
+
+ /* Write meshlink.conf with the updated port number */
+ write_main_config_files(mesh);
+
+ rval = config_sync(mesh, "current");
+
done:
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return rval && meshlink_get_port(mesh) == port;
}
s = (meshlink_submesh_t *)mesh->self->submesh;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
// Check validity of the new node's name
if(!check_id(name)) {
- logger(mesh, MESHLINK_DEBUG, "Invalid name for node.\n");
+ logger(mesh, MESHLINK_ERROR, "Invalid name for node.\n");
meshlink_errno = MESHLINK_EINVAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
// Ensure no host configuration file with that name exists
if(config_exists(mesh, "current", name)) {
- logger(mesh, MESHLINK_DEBUG, "A host config file for %s already exists!\n", name);
+ logger(mesh, MESHLINK_ERROR, "A host config file for %s already exists!\n", name);
meshlink_errno = MESHLINK_EEXIST;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
// Ensure no other nodes know about this name
- if(meshlink_get_node(mesh, name)) {
- logger(mesh, MESHLINK_DEBUG, "A node with name %s is already known!\n", name);
+ if(lookup_node(mesh, name)) {
+ logger(mesh, MESHLINK_ERROR, "A node with name %s is already known!\n", name);
meshlink_errno = MESHLINK_EEXIST;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
char *address = get_my_hostname(mesh, flags);
if(!address) {
- logger(mesh, MESHLINK_DEBUG, "No Address known for ourselves!\n");
+ logger(mesh, MESHLINK_ERROR, "No Address known for ourselves!\n");
meshlink_errno = MESHLINK_ERESOLV;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
if(!refresh_invitation_key(mesh)) {
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
+ // If we changed our own host config file, write it out now
+ if(mesh->self->status.dirty) {
+ if(!node_write_config(mesh, mesh->self)) {
+ logger(mesh, MESHLINK_ERROR, "Could not write our own host config file!\n");
+ pthread_mutex_unlock(&mesh->mutex);
+ return NULL;
+ }
+ }
+
char hash[64];
// Create a hash of the key.
* 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};
+ config_t configs[5];
+ memset(configs, 0, sizeof(configs));
int count = 0;
if(config_read(mesh, "current", mesh->self->name, &configs[count], mesh->config_key)) {
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));
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
xasprintf(&url, "%s/%s%s", address, hash, cookie);
free(address);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
return url;
}
return false;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ join_state_t state = {
+ .mesh = mesh,
+ .sock = -1,
+ };
+
+ ecdsa_t *key = NULL;
+ ecdsa_t *hiskey = NULL;
+
+ //TODO: think of a better name for this variable, or of a different way to tokenize the invitation URL.
+ char copy[strlen(invitation) + 1];
+
+ pthread_mutex_lock(&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");
+ logger(mesh, MESHLINK_ERROR, "Cannot join while started\n");
meshlink_errno = MESHLINK_EINVAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return false;
+ goto exit;
+ }
+
+ // 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;
+ goto exit;
}
- //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 a list of hostname/port tuples, a key hash and a cookie.
char *address = copy;
char *port = NULL;
- if(!b64decode(slash, mesh->hash, 18) || !b64decode(slash + 24, mesh->cookie, 18)) {
+ if(!b64decode(slash, state.hash, 18) || !b64decode(slash + 24, state.cookie, 18)) {
goto invalid;
}
+ if(mesh->inviter_commits_first) {
+ memcpy(state.cookie + 18, ecdsa_get_public_key(mesh->private_key), 32);
+ }
+
// Generate a throw-away key for the invitation.
- ecdsa_t *key = ecdsa_generate();
+ key = ecdsa_generate();
if(!key) {
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return false;
+ goto exit;
}
char *b64key = ecdsa_get_base64_public_key(key);
char *comma;
- mesh->sock = -1;
while(address && *address) {
// We allow commas in the address part to support multiple addresses in one invitation URL.
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);
+ state.sock = socket_in_netns(aip->ai_family, aip->ai_socktype, aip->ai_protocol, mesh->netns);
- if(mesh->sock == -1) {
+ if(state.sock == -1) {
logger(mesh, MESHLINK_DEBUG, "Could not open socket: %s\n", strerror(errno));
meshlink_errno = MESHLINK_ENETWORK;
continue;
}
- set_timeout(mesh->sock, 5000);
+ set_timeout(state.sock, 5000);
- if(connect(mesh->sock, aip->ai_addr, aip->ai_addrlen)) {
+ if(connect(state.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;
+ closesocket(state.sock);
+ state.sock = -1;
continue;
}
+
+ break;
}
freeaddrinfo(ai);
meshlink_errno = MESHLINK_ERESOLV;
}
- if(mesh->sock != -1 || !comma) {
+ if(state.sock != -1 || !comma) {
break;
}
address = comma;
}
- if(mesh->sock == -1) {
- pthread_mutex_unlock(&mesh->mesh_mutex);
- return false;
+ if(state.sock == -1) {
+ goto exit;
}
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;
+ state.blen = 0;
- if(!sendline(mesh->sock, "0 ?%s %d.%d %s", b64key, PROT_MAJOR, PROT_MINOR, mesh->appname)) {
+ if(!sendline(state.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;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return false;
+ goto exit;
}
free(b64key);
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(&state) || sscanf(state.line, "%d %s %d.%d", &code, hisname, &hismajor, &hisminor) < 3 || code != 0 || hismajor != PROT_MAJOR || !check_id(hisname) || !recvline(&state) || !rstrip(state.line) || sscanf(state.line, "%d ", &code) != 1 || code != ACK || strlen(state.line) < 3) {
logger(mesh, MESHLINK_DEBUG, "Cannot read greeting from peer\n");
- closesocket(mesh->sock);
meshlink_errno = MESHLINK_ENETWORK;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return false;
+ goto exit;
}
// Check if the hash of the key he gave us matches the hash in the URL.
- char *fingerprint = mesh->line + 2;
+ char *fingerprint = state.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);
+ logger(mesh, MESHLINK_DEBUG, "Could not create hash\n%s\n", state.line + 2);
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return false;
+ goto exit;
}
- if(memcmp(hishash, mesh->hash, 18)) {
- logger(mesh, MESHLINK_DEBUG, "Peer has an invalid key!\n%s\n", mesh->line + 2);
+ if(memcmp(hishash, state.hash, 18)) {
+ logger(mesh, MESHLINK_DEBUG, "Peer has an invalid key!\n%s\n", state.line + 2);
meshlink_errno = MESHLINK_EPEER;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return false;
-
+ goto exit;
}
- ecdsa_t *hiskey = ecdsa_set_base64_public_key(fingerprint);
+ hiskey = ecdsa_set_base64_public_key(fingerprint);
if(!hiskey) {
meshlink_errno = MESHLINK_EINTERNAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return false;
+ goto exit;
}
// Start an SPTPS session
- if(!sptps_start(&mesh->sptps, mesh, true, false, key, hiskey, meshlink_invitation_label, sizeof(meshlink_invitation_label), invitation_send, invitation_receive)) {
+ if(!sptps_start(&state.sptps, &state, 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;
+ goto exit;
}
// Feed rest of input buffer to SPTPS
- if(!sptps_receive_data(&mesh->sptps, mesh->buffer, mesh->blen)) {
+ if(!sptps_receive_data(&state.sptps, state.buffer, state.blen)) {
meshlink_errno = MESHLINK_EPEER;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return false;
+ goto exit;
}
- int len;
+ ssize_t len;
+ logger(mesh, MESHLINK_DEBUG, "Starting invitation recv loop: %d %zu\n", state.sock, sizeof(state.line));
- while((len = recv(mesh->sock, mesh->line, sizeof(mesh)->line, 0))) {
+ while((len = recv(state.sock, state.line, sizeof(state.line), 0))) {
if(len < 0) {
if(errno == EINTR) {
continue;
logger(mesh, MESHLINK_DEBUG, "Error reading data from %s port %s: %s\n", address, port, strerror(errno));
meshlink_errno = MESHLINK_ENETWORK;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return false;
+ goto exit;
}
- if(!sptps_receive_data(&mesh->sptps, mesh->line, len)) {
+ if(!sptps_receive_data(&state.sptps, state.line, len)) {
meshlink_errno = MESHLINK_EPEER;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return false;
+ goto exit;
}
}
- sptps_stop(&mesh->sptps);
- ecdsa_free(hiskey);
- ecdsa_free(key);
- closesocket(mesh->sock);
-
- if(!mesh->success) {
+ if(!state.success) {
logger(mesh, MESHLINK_DEBUG, "Connection closed by peer, invitation cancelled.\n");
meshlink_errno = MESHLINK_EPEER;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return false;
+ goto exit;
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ sptps_stop(&state.sptps);
+ ecdsa_free(hiskey);
+ ecdsa_free(key);
+ closesocket(state.sock);
+
+ pthread_mutex_unlock(&mesh->mutex);
return true;
invalid:
logger(mesh, MESHLINK_DEBUG, "Invalid invitation URL\n");
meshlink_errno = MESHLINK_EINVAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+exit:
+ sptps_stop(&state.sptps);
+ ecdsa_free(hiskey);
+ ecdsa_free(key);
+
+ if(state.sock != -1) {
+ closesocket(state.sock);
+ }
+
+ pthread_mutex_unlock(&mesh->mutex);
return false;
}
packmsg_add_str(&out, mesh->name);
packmsg_add_str(&out, CORE_MESH);
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
packmsg_add_int32(&out, mesh->self->devclass);
packmsg_add_bool(&out, mesh->self->status.blacklisted);
uint32_t count = 0;
- for(uint32_t i = 0; i < 5; i++) {
+ for(uint32_t i = 0; i < MAX_RECENT; i++) {
if(mesh->self->recent[i].sa.sa_family) {
count++;
} else {
packmsg_add_sockaddr(&out, &mesh->self->recent[i]);
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ packmsg_add_int64(&out, 0);
+ packmsg_add_int64(&out, 0);
+
+ pthread_mutex_unlock(&mesh->mutex);
if(!packmsg_output_ok(&out)) {
logger(mesh, MESHLINK_DEBUG, "Error creating export data\n");
return false;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
while(count--) {
const void *data;
break;
}
- config_write(mesh, "current", n->name, &config, mesh->config_key);
+ /* Clear the reachability times, since we ourself have never seen these nodes yet */
+ n->last_reachable = 0;
+ n->last_unreachable = 0;
+
+ if(!node_write_config(mesh, n)) {
+ free_node(n);
+ return false;
+ }
+
node_add(mesh, n);
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
+
+ free(buf);
if(!packmsg_done(&in)) {
logger(mesh, MESHLINK_ERROR, "Invalid data\n");
return false;
}
- return true;
-}
-
-void meshlink_blacklist(meshlink_handle_t *mesh, meshlink_node_t *node) {
- if(!mesh || !node) {
- meshlink_errno = MESHLINK_EINVAL;
- return;
+ if(!config_sync(mesh, "current")) {
+ return false;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
-
- node_t *n;
- n = (node_t *)node;
+ return true;
+}
+static bool blacklist(meshlink_handle_t *mesh, node_t *n) {
if(n == mesh->self) {
- logger(mesh, MESHLINK_ERROR, "%s blacklisting itself?\n", node->name);
+ logger(mesh, MESHLINK_ERROR, "%s blacklisting itself?\n", n->name);
meshlink_errno = MESHLINK_EINVAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return;
+ return false;
}
if(n->status.blacklisted) {
- logger(mesh, MESHLINK_DEBUG, "Node %s already blacklisted\n", node->name);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return;
+ logger(mesh, MESHLINK_DEBUG, "Node %s already blacklisted\n", n->name);
+ return true;
}
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
+ /* Immediately shut down any connections we have with the blacklisted node.
+ * We can't call terminate_connection(), because we might be called from a callback function.
+ */
for list_each(connection_t, c, mesh->connections) {
if(c->node == n) {
- terminate_connection(mesh, c, c->status.active);
+ shutdown(c->socket, SHUT_RDWR);
}
}
n->status.udp_confirmed = false;
if(n->status.reachable) {
- update_node_status(mesh, n);
+ n->last_unreachable = mesh->loop.now.tv_sec;
+ }
+
+ /* Graph updates will suppress status updates for blacklisted nodes, so we need to
+ * manually call the status callback if necessary.
+ */
+ if(n->status.reachable && mesh->node_status_cb) {
+ mesh->node_status_cb(mesh, (meshlink_node_t *)n, false);
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ return node_write_config(mesh, n) && config_sync(mesh, "current");
}
-void meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) {
+bool meshlink_blacklist(meshlink_handle_t *mesh, meshlink_node_t *node) {
if(!mesh || !node) {
meshlink_errno = MESHLINK_EINVAL;
- return;
+ return false;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
- node_t *n = (node_t *)node;
+ if(!blacklist(mesh, (node_t *)node)) {
+ pthread_mutex_unlock(&mesh->mutex);
+ return false;
+ }
- if(!n->status.blacklisted) {
- logger(mesh, MESHLINK_DEBUG, "Node %s was already whitelisted\n", node->name);
+ pthread_mutex_unlock(&mesh->mutex);
+
+ logger(mesh, MESHLINK_DEBUG, "Blacklisted %s.\n", node->name);
+ return true;
+}
+
+bool meshlink_blacklist_by_name(meshlink_handle_t *mesh, const char *name) {
+ if(!mesh || !name) {
meshlink_errno = MESHLINK_EINVAL;
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return;
+ return false;
}
- n->status.blacklisted = false;
- node_write_config(mesh, n);
+ pthread_mutex_lock(&mesh->mutex);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- return;
-}
+ node_t *n = lookup_node(mesh, (char *)name);
-void meshlink_set_default_blacklist(meshlink_handle_t *mesh, bool blacklist) {
- mesh->default_blacklist = blacklist;
+ if(!n) {
+ n = new_node();
+ n->name = xstrdup(name);
+ node_add(mesh, n);
+ }
+
+ if(!blacklist(mesh, (node_t *)n)) {
+ pthread_mutex_unlock(&mesh->mutex);
+ return false;
+ }
+
+ pthread_mutex_unlock(&mesh->mutex);
+
+ logger(mesh, MESHLINK_DEBUG, "Blacklisted %s.\n", name);
+ return true;
}
-/* 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) {
- meshlink_errno = EINVAL;
- return;
+static bool whitelist(meshlink_handle_t *mesh, node_t *n) {
+ if(n == mesh->self) {
+ logger(mesh, MESHLINK_ERROR, "%s whitelisting itself?\n", n->name);
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ if(!n->status.blacklisted) {
+ logger(mesh, MESHLINK_DEBUG, "Node %s was already whitelisted\n", n->name);
+ return true;
}
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ n->status.blacklisted = false;
- 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);
+ if(n->status.reachable) {
+ n->last_reachable = mesh->loop.now.tv_sec;
+ update_node_status(mesh, n);
+ }
- pthread_mutex_unlock(&(mesh->mesh_mutex));
- // @TODO do we want to fire off a connection attempt right away?
+ return node_write_config(mesh, n) && config_sync(mesh, "current");
+}
+
+bool meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) {
+ if(!mesh || !node) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
+
+ if(!whitelist(mesh, (node_t *)node)) {
+ pthread_mutex_unlock(&mesh->mutex);
+ return false;
+ }
+
+ pthread_mutex_unlock(&mesh->mutex);
+
+ logger(mesh, MESHLINK_DEBUG, "Whitelisted %s.\n", node->name);
+ return true;
+}
+
+bool meshlink_whitelist_by_name(meshlink_handle_t *mesh, const char *name) {
+ if(!mesh || !name) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
+
+ node_t *n = lookup_node(mesh, (char *)name);
+
+ if(!n) {
+ n = new_node();
+ n->name = xstrdup(name);
+ node_add(mesh, n);
+ }
+
+ if(!whitelist(mesh, (node_t *)n)) {
+ pthread_mutex_unlock(&mesh->mutex);
+ return false;
+ }
+
+ pthread_mutex_unlock(&mesh->mutex);
+
+ logger(mesh, MESHLINK_DEBUG, "Whitelisted %s.\n", name);
+ return true;
+}
+
+void meshlink_set_default_blacklist(meshlink_handle_t *mesh, bool blacklist) {
+ mesh->default_blacklist = blacklist;
+}
+
+bool meshlink_forget_node(meshlink_handle_t *mesh, meshlink_node_t *node) {
+ if(!mesh || !node) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ node_t *n = (node_t *)node;
+
+ pthread_mutex_lock(&mesh->mutex);
+
+ /* Check that the node is not reachable */
+ if(n->status.reachable || n->connection) {
+ pthread_mutex_unlock(&mesh->mutex);
+ logger(mesh, MESHLINK_WARNING, "Could not forget %s: still reachable", n->name);
+ return false;
+ }
+
+ /* Check that we don't have any active UTCP connections */
+ if(n->utcp && utcp_is_active(n->utcp)) {
+ pthread_mutex_unlock(&mesh->mutex);
+ logger(mesh, MESHLINK_WARNING, "Could not forget %s: active UTCP connections", n->name);
+ return false;
+ }
+
+ /* Check that we have no active connections to this node */
+ for list_each(connection_t, c, mesh->connections) {
+ if(c->node == n) {
+ pthread_mutex_unlock(&mesh->mutex);
+ logger(mesh, MESHLINK_WARNING, "Could not forget %s: active connection", n->name);
+ return false;
+ }
+ }
+
+ /* Remove any pending outgoings to this node */
+ if(mesh->outgoings) {
+ for list_each(outgoing_t, outgoing, mesh->outgoings) {
+ if(outgoing->node == n) {
+ list_delete_node(mesh->outgoings, node);
+ }
+ }
+ }
+
+ /* Delete the config file for this node */
+ if(!config_delete(mesh, "current", n->name)) {
+ pthread_mutex_unlock(&mesh->mutex);
+ return false;
+ }
+
+ /* Delete the node struct and any remaining edges referencing this node */
+ node_del(mesh, n);
+
+ pthread_mutex_unlock(&mesh->mutex);
+
+ return config_sync(mesh, "current");
+}
+
+/* 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) {
+ meshlink_errno = EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
+
+ node_t *n = (node_t *)node;
+
+ if(node_add_recent_address(mesh, n, (sockaddr_t *)addr)) {
+ if(!node_write_config(mesh, n)) {
+ logger(mesh, MESHLINK_DEBUG, "Could not update %s\n", n->name);
+ }
+ }
+
+ pthread_mutex_unlock(&mesh->mutex);
+ // @TODO do we want to fire off a connection attempt right away?
}
static bool channel_pre_accept(struct utcp *utcp, uint16_t port) {
return mesh->channel_accept_cb;
}
+static void aio_signal(meshlink_handle_t *mesh, meshlink_channel_t *channel, meshlink_aio_buffer_t *aio) {
+ if(aio->data) {
+ if(aio->cb.buffer) {
+ aio->cb.buffer(mesh, channel, aio->data, aio->len, aio->priv);
+ }
+ } else {
+ if(aio->cb.fd) {
+ aio->cb.fd(mesh, channel, aio->fd, aio->done, aio->priv);
+ }
+ }
+}
+
static ssize_t channel_recv(struct utcp_connection *connection, const void *data, size_t len) {
meshlink_channel_t *channel = connection->priv;
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;
+ }
+
+ if(aio->data) {
+ memcpy((char *)aio->data + aio->done, p, todo);
+ } else {
+ ssize_t result = write(aio->fd, p, todo);
+
+ if(result > 0) {
+ todo = result;
+ }
+ }
+
+ aio->done += todo;
+
+ if(aio->done == aio->len) {
+ channel->aio_receive = aio->next;
+ aio_signal(mesh, channel, aio);
+ free(aio);
+ }
+
+ p += todo;
+ left -= todo;
+
+ if(!left && len) {
+ return len;
+ }
+ }
+
+ if(channel->receive_cb) {
+ channel->receive_cb(mesh, channel, p, left);
}
return len;
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;
+ ssize_t sent;
+
+ if(len > left) {
+ len = left;
+ }
+
+ if(aio->data) {
+ sent = utcp_send(connection, (char *)aio->data + aio->done, len);
+ } else {
+ char buf[65536];
+ size_t todo = utcp_get_sndbuf_free(connection);
+
+ if(todo > left) {
+ todo = left;
+ }
+
+ if(todo > sizeof(buf)) {
+ todo = sizeof(buf);
+ }
+
+ ssize_t result = read(aio->fd, buf, todo);
+
+ if(result > 0) {
+ sent = utcp_send(connection, buf, result);
+ } else {
+ sent = result;
+ }
+ }
- if(channel->poll_cb) {
- channel->poll_cb(mesh, channel, len);
+ if(sent >= 0) {
+ aio->done += sent;
+ }
+
+ /* If the buffer is now completely sent, call the callback and dispose of it. */
+ if(aio->done >= aio->len) {
+ channel->aio_send = aio->next;
+ aio_signal(mesh, channel, aio);
+ 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;
+ if(!mesh || !channel) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
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);
+ pthread_mutex_unlock(&mesh->mutex);
}
void meshlink_set_channel_accept_cb(meshlink_handle_t *mesh, meshlink_channel_accept_cb_t cb) {
return;
}
- pthread_mutex_lock(&mesh->mesh_mutex);
+ pthread_mutex_lock(&mesh->mutex);
mesh->channel_accept_cb = cb;
mesh->receive_cb = channel_receive;
}
}
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ pthread_mutex_unlock(&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->mutex);
+ utcp_set_sndbuf(channel->c, size);
+ pthread_mutex_unlock(&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->mutex);
+ utcp_set_rcvbuf(channel->c, size);
+ pthread_mutex_unlock(&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) {
+ if(data && len) {
abort(); // TODO: handle non-NULL data
}
return NULL;
}
+ pthread_mutex_lock(&mesh->mutex);
+
node_t *n = (node_t *)node;
if(!n->utcp) {
if(!n->utcp) {
meshlink_errno = errno == ENOMEM ? MESHLINK_ENOMEM : MESHLINK_EINTERNAL;
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
}
if(n->status.blacklisted) {
logger(mesh, MESHLINK_ERROR, "Cannot open a channel with blacklisted node\n");
+ meshlink_errno = MESHLINK_EBLACKLISTED;
+ pthread_mutex_unlock(&mesh->mutex);
return NULL;
}
meshlink_channel_t *channel = xzalloc(sizeof(*channel));
channel->node = n;
channel->receive_cb = cb;
+
+ if(data && !len) {
+ channel->priv = (void *)data;
+ }
+
channel->c = utcp_connect_ex(n->utcp, port, channel_recv, channel, flags);
+ pthread_mutex_unlock(&mesh->mutex);
+
if(!channel->c) {
meshlink_errno = errno == ENOMEM ? MESHLINK_ENOMEM : MESHLINK_EINTERNAL;
free(channel);
return;
}
+ pthread_mutex_lock(&mesh->mutex);
utcp_shutdown(channel->c, direction);
+ pthread_mutex_unlock(&mesh->mutex);
}
void meshlink_channel_close(meshlink_handle_t *mesh, meshlink_channel_t *channel) {
return;
}
+ pthread_mutex_lock(&mesh->mutex);
+
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;
+ aio_signal(mesh, channel, aio);
+ free(aio);
+ }
+
+ for(meshlink_aio_buffer_t *aio = channel->aio_receive, *next; aio; aio = next) {
+ next = aio->next;
+ aio_signal(mesh, channel, aio);
+ free(aio);
+ }
+
+ pthread_mutex_unlock(&mesh->mutex);
+
free(channel);
}
// Then, preferably only if there is room in the receiver window,
// kick the meshlink thread to go send packets.
- pthread_mutex_lock(&mesh->mesh_mutex);
- ssize_t retval = utcp_send(channel->c, data, len);
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ ssize_t retval;
+
+ pthread_mutex_lock(&mesh->mutex);
+
+ /* 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->mutex);
if(retval < 0) {
meshlink_errno = MESHLINK_ENETWORK;
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.buffer = cb;
+ aio->priv = priv;
+
+ pthread_mutex_lock(&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->mutex);
+
+ return true;
+}
+
+bool meshlink_channel_aio_fd_send(meshlink_handle_t *mesh, meshlink_channel_t *channel, int fd, size_t len, meshlink_aio_fd_cb_t cb, void *priv) {
+ if(!mesh || !channel) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ if(!len || fd == -1) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ meshlink_aio_buffer_t *aio = xzalloc(sizeof(*aio));
+ aio->fd = fd;
+ aio->len = len;
+ aio->cb.fd = cb;
+ aio->priv = priv;
+
+ pthread_mutex_lock(&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->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.buffer = cb;
+ aio->priv = priv;
+
+ pthread_mutex_lock(&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->mutex);
+
+ return true;
+}
+
+bool meshlink_channel_aio_fd_receive(meshlink_handle_t *mesh, meshlink_channel_t *channel, int fd, size_t len, meshlink_aio_fd_cb_t cb, void *priv) {
+ if(!mesh || !channel) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ if(!len || fd == -1) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return false;
+ }
+
+ meshlink_aio_buffer_t *aio = xzalloc(sizeof(*aio));
+ aio->fd = fd;
+ aio->len = len;
+ aio->cb.fd = cb;
+ aio->priv = priv;
+
+ pthread_mutex_lock(&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->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 utcp_get_recvq(channel->c);
}
+void meshlink_set_node_channel_timeout(meshlink_handle_t *mesh, meshlink_node_t *node, int timeout) {
+ if(!mesh || !node) {
+ meshlink_errno = MESHLINK_EINVAL;
+ return;
+ }
+
+ node_t *n = (node_t *)node;
+
+ pthread_mutex_lock(&mesh->mutex);
+
+ if(!n->utcp) {
+ n->utcp = utcp_init(channel_accept, channel_pre_accept, channel_send, n);
+ }
+
+ utcp_set_user_timeout(n->utcp, timeout);
+
+ pthread_mutex_unlock(&mesh->mutex);
+}
+
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 && !n->status.blacklisted);
}
+
+ if(mesh->node_pmtu_cb) {
+ mesh->node_pmtu_cb(mesh, (meshlink_node_t *)n, n->minmtu);
+ }
+}
+
+void update_node_pmtu(meshlink_handle_t *mesh, node_t *n) {
+ if(mesh->node_pmtu_cb && !n->status.blacklisted) {
+ mesh->node_pmtu_cb(mesh, (meshlink_node_t *)n, n->minmtu);
+ }
}
void handle_duplicate_node(meshlink_handle_t *mesh, node_t *n) {
return;
}
- pthread_mutex_lock(&mesh->mesh_mutex);
+ pthread_mutex_lock(&mesh->mutex);
if(mesh->discovery == enable) {
goto end;
mesh->discovery = enable;
end:
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ pthread_mutex_unlock(&mesh->mutex);
#else
(void)mesh;
(void)enable;
#endif
}
+void meshlink_set_dev_class_timeouts(meshlink_handle_t *mesh, dev_class_t devclass, int pinginterval, int pingtimeout) {
+ if(!mesh || devclass < 0 || devclass >= DEV_CLASS_COUNT) {
+ meshlink_errno = EINVAL;
+ return;
+ }
+
+ if(pinginterval < 1 || pingtimeout < 1 || pingtimeout > pinginterval) {
+ meshlink_errno = EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
+ mesh->dev_class_traits[devclass].pinginterval = pinginterval;
+ mesh->dev_class_traits[devclass].pingtimeout = pingtimeout;
+ pthread_mutex_unlock(&mesh->mutex);
+}
+
+void meshlink_set_dev_class_fast_retry_period(meshlink_handle_t *mesh, dev_class_t devclass, int fast_retry_period) {
+ if(!mesh || devclass < 0 || devclass >= DEV_CLASS_COUNT) {
+ meshlink_errno = EINVAL;
+ return;
+ }
+
+ if(fast_retry_period < 0) {
+ meshlink_errno = EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
+ mesh->dev_class_traits[devclass].fast_retry_period = fast_retry_period;
+ pthread_mutex_unlock(&mesh->mutex);
+}
+
+extern void meshlink_set_inviter_commits_first(struct meshlink_handle *mesh, bool inviter_commits_first) {
+ if(!mesh) {
+ meshlink_errno = EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
+ mesh->inviter_commits_first = inviter_commits_first;
+ pthread_mutex_unlock(&mesh->mutex);
+}
+
+void meshlink_set_external_address_discovery_url(struct meshlink_handle *mesh, const char *url) {
+ if(!mesh) {
+ meshlink_errno = EINVAL;
+ return;
+ }
+
+ if(url && (strncmp(url, "http://", 7) || strchr(url, ' '))) {
+ meshlink_errno = EINVAL;
+ return;
+ }
+
+ pthread_mutex_lock(&mesh->mutex);
+ free(mesh->external_address_url);
+ mesh->external_address_url = url ? xstrdup(url) : NULL;
+ pthread_mutex_unlock(&mesh->mutex);
+}
+
+void handle_network_change(meshlink_handle_t *mesh, bool online) {
+ (void)online;
+
+ if(!mesh->connections || !mesh->loop.running) {
+ return;
+ }
+
+ retry(mesh);
+}
+
+void call_error_cb(meshlink_handle_t *mesh, meshlink_errno_t meshlink_errno) {
+ // We should only call the callback function if we are in the background thread.
+ if(!mesh->error_cb) {
+ return;
+ }
+
+ if(!mesh->threadstarted) {
+ return;
+ }
+
+ if(mesh->thread == pthread_self()) {
+ mesh->error_cb(mesh, meshlink_errno);
+ }
+}
+
static void __attribute__((constructor)) meshlink_init(void) {
crypto_init();
- unsigned int seed;
- randomize(&seed, sizeof(seed));
- srand(seed);
}
static void __attribute__((destructor)) meshlink_exit(void) {
crypto_exit();
}
-
-/// Device class traits
-dev_class_traits_t dev_class_traits[_DEV_CLASS_MAX + 1] = {
- { .min_connects = 3, .max_connects = 10000, .edge_weight = 1 }, // DEV_CLASS_BACKBONE
- { .min_connects = 3, .max_connects = 100, .edge_weight = 3 }, // DEV_CLASS_STATIONARY
- { .min_connects = 3, .max_connects = 3, .edge_weight = 6 }, // DEV_CLASS_PORTABLE
- { .min_connects = 1, .max_connects = 1, .edge_weight = 9 }, // DEV_CLASS_UNKNOWN
-};
projects / meshlink / blobdiff