X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdiscovery.c;h=34b49fa23d86bde1bb2bcf490d3c47499658f2dc;hb=37a84628bef84b1e117d6196d9c091bb8ba90a12;hp=323d22cfdf433438b51e44692132c46ca2455fb0;hpb=ea20fcfcded669ce8fbbda3a1f93f354ed254603;p=meshlink diff --git a/src/discovery.c b/src/discovery.c index 323d22cf..34b49fa2 100644 --- a/src/discovery.c +++ b/src/discovery.c @@ -9,7 +9,18 @@ #include #include +#if defined(__APPLE__) || defined(__unix) && !defined(__linux) +#include +#elif defined(__linux) +#include +#include +#include +#include +#include +#endif + #include "meshlink_internal.h" +#include "event.h" #include "discovery.h" #include "sockaddr.h" #include "logger.h" @@ -114,8 +125,6 @@ done: free(fingerprint); free(txt_name); free(txt_fingerprint); - - pthread_mutex_unlock(&(mesh->mesh_mutex)); } static void discovery_server_callback(CattaServer *server, CattaServerState state, void *userdata) { @@ -126,15 +135,18 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat switch(state) { case CATTA_SERVER_RUNNING: + /* The serve has startup successfully and registered its host * name on the network, so it's time to create our services */ - pthread_mutex_lock(&(mesh->mesh_mutex)); + if(pthread_mutex_lock(&mesh->mutex) != 0) { + abort(); + } if(!mesh->catta_group) { discovery_create_services(mesh); } - pthread_mutex_unlock(&(mesh->mesh_mutex)); + pthread_mutex_unlock(&mesh->mutex); break; @@ -143,7 +155,9 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat char hostname[17]; generate_rand_string(mesh, hostname, sizeof(hostname)); - pthread_mutex_lock(&(mesh->mesh_mutex)); + if(pthread_mutex_lock(&mesh->mutex) != 0) { + abort(); + } assert(mesh->catta_server); assert(mesh->catta_poll); @@ -154,12 +168,14 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat catta_simple_poll_quit(mesh->catta_poll); } - pthread_mutex_unlock(&(mesh->mesh_mutex)); + pthread_mutex_unlock(&mesh->mutex); } break; case CATTA_SERVER_REGISTERING: - pthread_mutex_lock(&(mesh->mesh_mutex)); + if(pthread_mutex_lock(&mesh->mutex) != 0) { + abort(); + } /* Let's drop our registered services. When the server is back * in CATTA_SERVER_RUNNING state we will register them @@ -169,12 +185,14 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat mesh->catta_group = NULL; } - pthread_mutex_unlock(&(mesh->mesh_mutex)); + pthread_mutex_unlock(&mesh->mutex); break; case CATTA_SERVER_FAILURE: - pthread_mutex_lock(&(mesh->mesh_mutex)); + if(pthread_mutex_lock(&mesh->mutex) != 0) { + abort(); + } assert(mesh->catta_server); assert(mesh->catta_poll); @@ -182,7 +200,7 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat /* Terminate on failure */ catta_simple_poll_quit(mesh->catta_poll); - pthread_mutex_unlock(&(mesh->mesh_mutex)); + pthread_mutex_unlock(&mesh->mutex); break; case CATTA_SERVER_INVALID: @@ -217,7 +235,9 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI char *node_fp = (char *)catta_string_list_get_text(node_fp_li) + strlen(MESHLINK_MDNS_FINGERPRINT_KEY); if(node_name[0] == '=' && node_fp[0] == '=') { - pthread_mutex_lock(&(mesh->mesh_mutex)); + if(pthread_mutex_lock(&mesh->mutex) != 0) { + abort(); + } node_name += 1; @@ -250,20 +270,22 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI } if(naddress.unknown.family != AF_UNKNOWN) { - meshlink_hint_address(mesh, (meshlink_node_t *)node, (struct sockaddr *)&naddress); - node_t *n = (node_t *)node; + connection_t *c = n->connection; + + n->catta_address = naddress; + node_add_recent_address(mesh, n, &naddress); - if(n->connection && n->connection->outgoing) { - n->connection->outgoing->timeout = 0; + if(c && c->outgoing && !c->status.active) { + c->outgoing->timeout = 0; - if(n->connection->outgoing->ev.cb) { - timeout_set(&mesh->loop, &n->connection->outgoing->ev, &(struct timeval) { + if(c->outgoing->ev.cb) { + timeout_set(&mesh->loop, &c->outgoing->ev, &(struct timespec) { 0, 0 }); } - n->connection->last_ping_time = 0; + c->last_ping_time = -3600; } } else { @@ -273,7 +295,7 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI logger(mesh, MESHLINK_WARNING, "Node %s is not part of the mesh network.\n", node_name); } - pthread_mutex_unlock(&(mesh->mesh_mutex)); + pthread_mutex_unlock(&mesh->mutex); } } @@ -288,22 +310,31 @@ static void discovery_browse_callback(CattaSServiceBrowser *browser, CattaIfInde /* Called whenever a new services becomes available on the LAN or is removed from the LAN */ switch(event) { case CATTA_BROWSER_FAILURE: - pthread_mutex_lock(&mesh->mesh_mutex); + if(pthread_mutex_lock(&mesh->mutex) != 0) { + abort(); + } + catta_simple_poll_quit(mesh->catta_poll); - pthread_mutex_unlock(&mesh->mesh_mutex); + pthread_mutex_unlock(&mesh->mutex); break; case CATTA_BROWSER_NEW: - pthread_mutex_lock(&mesh->mesh_mutex); + if(pthread_mutex_lock(&mesh->mutex) != 0) { + abort(); + } + catta_s_service_resolver_new(mesh->catta_server, interface_, protocol, name, type, domain, CATTA_PROTO_UNSPEC, 0, discovery_resolve_callback, mesh); handle_network_change(mesh, ++mesh->catta_interfaces); - pthread_mutex_unlock(&mesh->mesh_mutex); + pthread_mutex_unlock(&mesh->mutex); break; case CATTA_BROWSER_REMOVE: - pthread_mutex_lock(&mesh->mesh_mutex); + if(pthread_mutex_lock(&mesh->mutex) != 0) { + abort(); + } + handle_network_change(mesh, --mesh->catta_interfaces); - pthread_mutex_unlock(&mesh->mesh_mutex); + pthread_mutex_unlock(&mesh->mutex); break; case CATTA_BROWSER_ALL_FOR_NOW: @@ -343,6 +374,10 @@ static void *discovery_loop(void *userdata) { meshlink_handle_t *mesh = userdata; assert(mesh); + if(pthread_mutex_lock(&mesh->discovery_mutex) != 0) { + abort(); + } + // handle catta logs catta_set_log_function(discovery_log_cb); @@ -390,15 +425,23 @@ static void *discovery_loop(void *userdata) { config.publish_hinfo = 0; config.publish_addresses = 1; config.publish_no_reverse = 1; + config.allow_point_to_point = 1; /* Allocate a new server */ int error; - mesh->catta_server = catta_server_new(catta_simple_poll_get(mesh->catta_poll), &config, discovery_server_callback, mesh, &error); + const CattaPoll *poller = catta_simple_poll_get(mesh->catta_poll); + + if(!poller) { + logger(mesh, MESHLINK_ERROR, "Failed to create discovery server: %s\n", catta_strerror(error)); + goto fail; + } + + mesh->catta_server = catta_server_new(poller, &config, discovery_server_callback, mesh, &error); /* Free the configuration data */ catta_server_config_free(&config); - /* Check wether creating the server object succeeded */ + /* Check whether creating the server object succeeded */ if(!mesh->catta_server) { logger(mesh, MESHLINK_ERROR, "Failed to create discovery server: %s\n", catta_strerror(error)); goto fail; @@ -414,7 +457,6 @@ static void *discovery_loop(void *userdata) { fail: - pthread_mutex_lock(&mesh->discovery_mutex); pthread_cond_broadcast(&mesh->discovery_cond); pthread_mutex_unlock(&mesh->discovery_mutex); @@ -451,6 +493,190 @@ fail: return NULL; } +#if defined(__linux) +static void netlink_getlink(int fd) { + static const struct { + struct nlmsghdr nlm; + struct ifinfomsg ifi; + } msg = { + .nlm.nlmsg_len = NLMSG_LENGTH(sizeof(msg.ifi)), + .nlm.nlmsg_type = RTM_GETLINK, + .nlm.nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST, + .nlm.nlmsg_seq = 1, + .ifi.ifi_family = AF_UNSPEC, + }; + send(fd, &msg, msg.nlm.nlmsg_len, 0); +} + +static void netlink_getaddr(int fd) { + static const struct { + struct nlmsghdr nlm; + struct ifaddrmsg ifa; + } msg = { + .nlm.nlmsg_len = NLMSG_LENGTH(sizeof(msg.ifa)), + .nlm.nlmsg_type = RTM_GETADDR, + .nlm.nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST, + .nlm.nlmsg_seq = 2, + .ifa.ifa_family = AF_UNSPEC, + }; + send(fd, &msg, msg.nlm.nlmsg_len, 0); +} + +static void netlink_parse_link(meshlink_handle_t *mesh, const struct nlmsghdr *nlm) { + const struct ifinfomsg *ifi = (const struct ifinfomsg *)(nlm + 1); + + if(ifi->ifi_flags & IFF_UP && ifi->ifi_flags & IFF_MULTICAST) { + logger(mesh, MESHLINK_INFO, "iface %d active\n", ifi->ifi_index); + } else { + logger(mesh, MESHLINK_INFO, "iface %d inactive\n", ifi->ifi_index); + } +} + +static void netlink_parse_addr(meshlink_handle_t *mesh, const struct nlmsghdr *nlm) { + const struct ifaddrmsg *ifa = (const struct ifaddrmsg *)(nlm + 1); + const uint8_t *ptr = (const uint8_t *)(ifa + 1); + size_t len = nlm->nlmsg_len - (ptr - (const uint8_t *)nlm); + + while(len >= sizeof(struct rtattr)) { + const struct rtattr *rta = (const struct rtattr *)ptr; + + if(rta->rta_len <= 0 || rta->rta_len > len) { + break; + } + + if(rta->rta_type == IFA_ADDRESS) { + char dest[40] = "?"; + + if(rta->rta_len == 8) { + inet_ntop(AF_INET, ptr + 4, dest, sizeof dest); + } else if(rta->rta_len == 20) { + inet_ntop(AF_INET6, ptr + 4, dest, sizeof dest); + } + + logger(mesh, MESHLINK_INFO, "iface %d address %s %s\n", ifa->ifa_index, dest, nlm->nlmsg_type == RTM_NEWADDR ? "new" : "del"); + } + + unsigned short rta_len = (rta->rta_len + 3) & ~3; + ptr += rta_len; + len -= rta_len; + } +} + +static void netlink_parse(meshlink_handle_t *mesh, const void *data, size_t len) { + const uint8_t *ptr = data; + + while(len >= sizeof(struct nlmsghdr)) { + const struct nlmsghdr *nlm = (const struct nlmsghdr *)ptr; + + if(nlm->nlmsg_len > len) { + break; + } + + switch(nlm->nlmsg_type) { + case RTM_NEWLINK: + case RTM_DELLINK: + netlink_parse_link(mesh, nlm); + break; + + case RTM_NEWADDR: + case RTM_DELADDR: + netlink_parse_addr(mesh, nlm); + } + + ptr += nlm->nlmsg_len; + len -= nlm->nlmsg_len; + } +} + +static void netlink_io_handler(event_loop_t *loop, void *data, int flags) { + (void)flags; + static time_t prev_update; + meshlink_handle_t *mesh = data; + + struct { + struct nlmsghdr nlm; + char data[16384]; + } msg; + + while(true) { + ssize_t result = recv(mesh->pfroute_io.fd, &msg, sizeof(msg), MSG_DONTWAIT); + + if(result <= 0) { + if(result == 0 || errno == EAGAIN || errno == EINTR) { + break; + } + + logger(mesh, MESHLINK_ERROR, "Reading from Netlink socket failed: %s\n", strerror(errno)); + io_set(loop, &mesh->pfroute_io, 0); + } + + if((size_t)result < sizeof(msg.nlm)) { + logger(mesh, MESHLINK_ERROR, "Invalid Netlink message\n"); + break; + } + + if(msg.nlm.nlmsg_type == NLMSG_DONE) { + if(msg.nlm.nlmsg_seq == 1) { + // We just got the result of GETLINK, now send GETADDR. + netlink_getaddr(mesh->pfroute_io.fd); + } + } else { + netlink_parse(mesh, &msg, result); + + if(loop->now.tv_sec > prev_update + 5) { + prev_update = loop->now.tv_sec; + handle_network_change(mesh, 1); + } + } + } +} +#elif defined(RTM_NEWADDR) +static void pfroute_io_handler(event_loop_t *loop, void *data, int flags) { + (void)flags; + static time_t prev_update; + meshlink_handle_t *mesh = data; + + struct { + struct rt_msghdr rtm; + char data[2048]; + } msg; + + while(true) { + msg.rtm.rtm_version = 0; + ssize_t result = recv(mesh->pfroute_io.fd, &msg, sizeof(msg), MSG_DONTWAIT); + + if(result <= 0) { + if(result == 0 || errno == EAGAIN || errno == EINTR) { + break; + } + + logger(mesh, MESHLINK_ERROR, "Reading from PFROUTE socket failed: %s\n", strerror(errno)); + io_set(loop, &mesh->pfroute_io, 0); + } + + if(msg.rtm.rtm_version != RTM_VERSION) { + logger(mesh, MESHLINK_ERROR, "Invalid PFROUTE message version\n"); + break; + } + + switch(msg.rtm.rtm_type) { + case RTM_IFINFO: + case RTM_NEWADDR: + case RTM_DELADDR: + if(loop->now.tv_sec > prev_update + 5) { + prev_update = loop->now.tv_sec; + handle_network_change(mesh, 1); + } + + break; + + default: + break; + } + } +} +#endif + bool discovery_start(meshlink_handle_t *mesh) { logger(mesh, MESHLINK_DEBUG, "discovery_start called\n"); @@ -461,19 +687,53 @@ bool discovery_start(meshlink_handle_t *mesh) { assert(!mesh->discovery_threadstarted); assert(!mesh->catta_servicetype); + if(pthread_mutex_lock(&mesh->discovery_mutex) != 0) { + abort(); + } + // Start the discovery thread if(pthread_create(&mesh->discovery_thread, NULL, discovery_loop, mesh) != 0) { + pthread_mutex_unlock(&mesh->discovery_mutex); logger(mesh, MESHLINK_ERROR, "Could not start discovery thread: %s\n", strerror(errno)); memset(&mesh->discovery_thread, 0, sizeof(mesh)->discovery_thread); return false; } - pthread_mutex_lock(&mesh->discovery_mutex); pthread_cond_wait(&mesh->discovery_cond, &mesh->discovery_mutex); pthread_mutex_unlock(&mesh->discovery_mutex); mesh->discovery_threadstarted = true; +#if defined(__linux) + int sock = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE); + + if(sock != -1) { + struct sockaddr_nl sa; + memset(&sa, 0, sizeof(sa)); + sa.nl_family = AF_NETLINK; + sa.nl_groups = RTMGRP_LINK | RTMGRP_IPV4_IFADDR | RTMGRP_IPV6_IFADDR; + + if(bind(sock, (struct sockaddr *)&sa, sizeof(sa)) != -1) { + io_add(&mesh->loop, &mesh->pfroute_io, netlink_io_handler, mesh, sock, IO_READ); + netlink_getlink(sock); + } else { + logger(mesh, MESHLINK_WARNING, "Could not bind AF_NETLINK socket: %s", strerror(errno)); + } + } else { + logger(mesh, MESHLINK_WARNING, "Could not open AF_NETLINK socket: %s", strerror(errno)); + } + +#elif defined(RTM_NEWADDR) + int sock = socket(PF_ROUTE, SOCK_RAW, AF_UNSPEC); + + if(sock != -1) { + io_add(&mesh->loop, &mesh->pfroute_io, pfroute_io_handler, mesh, sock, IO_READ); + } else { + logger(mesh, MESHLINK_WARNING, "Could not open PF_ROUTE socket: %s", strerror(errno)); + } + +#endif + return true; } @@ -482,6 +742,11 @@ void discovery_stop(meshlink_handle_t *mesh) { assert(mesh); + if(mesh->pfroute_io.cb) { + close(mesh->pfroute_io.fd); + io_del(&mesh->loop, &mesh->pfroute_io); + } + // Shut down if(mesh->catta_poll) { catta_simple_poll_quit(mesh->catta_poll); @@ -489,7 +754,10 @@ void discovery_stop(meshlink_handle_t *mesh) { // Wait for the discovery thread to finish if(mesh->discovery_threadstarted == true) { - pthread_join(mesh->discovery_thread, NULL); + if(pthread_join(mesh->discovery_thread, NULL) != 0) { + abort(); + } + mesh->discovery_threadstarted = false; }