X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=11e45503c4ccbebc9a9098c89a3ae7d52c27008f;hb=902446edf822a32383c4fa4b7c13b83a568095ad;hp=69ab8f244ef1e715e171b2b13fd8ff521fb27dab;hpb=703197ca7614963ba9b831967352b6c90379af48;p=meshlink diff --git a/src/meshlink.c b/src/meshlink.c index 69ab8f24..11e45503 100644 --- a/src/meshlink.c +++ b/src/meshlink.c @@ -37,6 +37,7 @@ #include "ed25519/sha512.h" #include "discovery.h" #include "devtools.h" +#include "graph.h" #ifndef MSG_NOSIGNAL #define MSG_NOSIGNAL 0 @@ -164,7 +165,7 @@ static int socket_in_netns(int domain, int type, int protocol, int netns) { // 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, @@ -191,7 +192,7 @@ static bool getlocaladdr(char *destaddr, struct sockaddr *sn, socklen_t *sl, int freeaddrinfo(rai); - if(getsockname(sock, sn, sl)) { + if(getsockname(sock, &sa->sa, salen)) { closesocket(sock); return false; } @@ -201,14 +202,14 @@ static bool getlocaladdr(char *destaddr, struct sockaddr *sn, socklen_t *sl, int } 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; } @@ -393,58 +394,66 @@ static char *get_my_hostname(meshlink_handle_t *mesh, uint32_t flags) { remove_duplicate_hostnames(hostname, port, 4); - if(!(flags & MESHLINK_INVITE_NUMERIC)) { - for(int i = 0; i < 4; i++) { - if(!hostname[i]) { - continue; - } + // Resolve the hostnames + for(int i = 0; i < 4; 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 + node_add_recent_address(mesh, mesh->self, (sockaddr_t *)ai_in->ai_addr); - if(err || !is_valid_hostname(resolved_host)) { - 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 @@ -456,13 +465,6 @@ static char *get_my_hostname(meshlink_handle_t *mesh, uint32_t flags) { 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]); @@ -611,7 +613,7 @@ static bool finalize_join(meshlink_handle_t *mesh, const void *buf, uint16_t len } // 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); @@ -654,11 +656,24 @@ static bool finalize_join(meshlink_handle_t *mesh, const void *buf, uint16_t len 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(!config_write(mesh, "current", n->name, &config, mesh->config_key)) { + if(getpeername(mesh->sock, &sa.sa, &salen) == 0) { + node_add_recent_address(mesh, n, &sa); + } + } + + if(!node_write_config(mesh, n)) { + free_node(n); return false; } + + node_add(mesh, n); } /* Ensure the configuration directory metadata is on disk */ @@ -705,7 +720,7 @@ static bool invitation_receive(void *handle, uint8_t type, const void *msg, uint return finalize_join(mesh, msg, len); case 1: - logger(mesh, MESHLINK_DEBUG, "Invitation succesfully accepted.\n"); + logger(mesh, MESHLINK_DEBUG, "Invitation successfully accepted.\n"); shutdown(mesh->sock, SHUT_RDWR); mesh->success = true; break; @@ -846,24 +861,24 @@ static struct timeval idle(event_loop_t *loop, void *data) { // 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; - sn.ss_family = AF_UNKNOWN; - 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); } } @@ -1513,8 +1528,9 @@ bool meshlink_start(meshlink_handle_t *mesh) { pthread_cond_wait(&mesh->cond, &mesh->mutex); mesh->threadstarted = true; - mesh->self->last_reachable = time(NULL); - mesh->self->status.dirty = true; + + // Ensure we are considered reachable + graph(mesh); pthread_mutex_unlock(&mesh->mutex); return true; @@ -1529,18 +1545,13 @@ void meshlink_stop(meshlink_handle_t *mesh) { pthread_mutex_lock(&mesh->mutex); logger(mesh, MESHLINK_DEBUG, "meshlink_stop called\n"); - if(mesh->self) { - mesh->self->last_unreachable = time(NULL); - mesh->self->status.dirty = true; - } - // 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)); @@ -1573,6 +1584,11 @@ void meshlink_stop(meshlink_handle_t *mesh) { exit_outgoings(mesh); + // 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) { @@ -2129,6 +2145,31 @@ meshlink_submesh_t *meshlink_get_node_submesh(meshlink_handle_t *mesh, meshlink_ 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; @@ -2372,7 +2413,7 @@ char *meshlink_invite_ex(meshlink_handle_t *mesh, meshlink_submesh_t *submesh, c // 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->mutex); return NULL; @@ -2380,7 +2421,7 @@ char *meshlink_invite_ex(meshlink_handle_t *mesh, meshlink_submesh_t *submesh, c // 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->mutex); return NULL; @@ -2388,7 +2429,7 @@ char *meshlink_invite_ex(meshlink_handle_t *mesh, meshlink_submesh_t *submesh, c // 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); + logger(mesh, MESHLINK_ERROR, "A node with name %s is already known!\n", name); meshlink_errno = MESHLINK_EEXIST; pthread_mutex_unlock(&mesh->mutex); return NULL; @@ -2398,7 +2439,7 @@ char *meshlink_invite_ex(meshlink_handle_t *mesh, meshlink_submesh_t *submesh, c 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->mutex); return NULL; @@ -2410,6 +2451,15 @@ char *meshlink_invite_ex(meshlink_handle_t *mesh, meshlink_submesh_t *submesh, c 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. @@ -2925,6 +2975,10 @@ static bool blacklist(meshlink_handle_t *mesh, node_t *n) { n->mtuprobes = 0; n->status.udp_confirmed = false; + if(n->status.reachable) { + 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. */ @@ -2996,6 +3050,7 @@ static bool whitelist(meshlink_handle_t *mesh, node_t *n) { n->status.blacklisted = false; if(n->status.reachable) { + n->last_reachable = mesh->loop.now.tv_sec; update_node_status(mesh, n); } @@ -3784,6 +3839,22 @@ void meshlink_set_dev_class_timeouts(meshlink_handle_t *mesh, dev_class_t devcla 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); +} + void handle_network_change(meshlink_handle_t *mesh, bool online) { (void)online;