#include "system.h"
-#include <catta/core.h>
-#include <catta/lookup.h>
-#include <catta/publish.h>
-#include <catta/log.h>
-#include <catta/simple-watch.h>
-#include <catta/malloc.h>
-#include <catta/alternative.h>
-#include <catta/error.h>
-
#if defined(__APPLE__) || defined(__unix) && !defined(__linux)
#include <net/route.h>
#elif defined(__linux)
#include <linux/rtnetlink.h>
#endif
+#include "mdns.h"
#include "meshlink_internal.h"
#include "event.h"
#include "discovery.h"
#include "netutl.h"
#include "node.h"
#include "connection.h"
+#include "utils.h"
#include "xalloc.h"
#define MESHLINK_MDNS_SERVICE_TYPE "_%s._tcp"
#define MESHLINK_MDNS_NAME_KEY "name"
#define MESHLINK_MDNS_FINGERPRINT_KEY "fingerprint"
-static void generate_rand_string(meshlink_handle_t *mesh, char *buffer, size_t size) {
- assert(size);
-
- for(size_t i = 0; i < (size - 1); ++i) {
- buffer[i] = 'a' + prng(mesh, 'z' - 'a' + 1);
- }
+static const sockaddr_t mdns_address_ipv4 = {
+ .in.sin_family = AF_INET,
+ .in.sin_addr.s_addr = 0xfb0000e0,
+ .in.sin_port = 0xe914,
+};
- buffer[size - 1] = '\0';
-}
+static const sockaddr_t mdns_address_ipv6 = {
+ .in6.sin6_family = AF_INET6,
+ .in6.sin6_addr.s6_addr[0x0] = 0xfd,
+ .in6.sin6_addr.s6_addr[0x1] = 0x02,
+ .in6.sin6_addr.s6_addr[0xf] = 0xfb,
+ .in6.sin6_port = 0xe914,
+};
-static void discovery_entry_group_callback(CattaServer *server, CattaSEntryGroup *group, CattaEntryGroupState state, void *userdata) {
- (void)server;
- (void)group;
- meshlink_handle_t *mesh = userdata;
-
- assert(mesh);
- assert(mesh->catta_server);
- assert(mesh->catta_poll);
-
- /* Called whenever the entry group state changes */
- switch(state) {
- case CATTA_ENTRY_GROUP_ESTABLISHED:
- /* The entry group has been established successfully */
- logger(mesh, MESHLINK_DEBUG, "Catta Service successfully established.\n");
- break;
+typedef struct discovery_address {
+ int index;
+ bool up;
+ sockaddr_t address;
+} discovery_address_t;
- case CATTA_ENTRY_GROUP_COLLISION:
- logger(mesh, MESHLINK_WARNING, "Catta Service collision.\n");
- // @TODO can we just set a new name and retry?
- break;
+static int iface_compare(const void *va, const void *vb) {
+ const int *a = va;
+ const int *b = vb;
+ return *a - *b;
+}
- case CATTA_ENTRY_GROUP_FAILURE :
- /* Some kind of failure happened while we were registering our services */
- logger(mesh, MESHLINK_ERROR, "Catta Entry group failure: %s\n", catta_strerror(catta_server_errno(mesh->catta_server)));
- catta_simple_poll_quit(mesh->catta_poll);
- break;
+static int address_compare(const void *va, const void *vb) {
+ const discovery_address_t *a = va;
+ const discovery_address_t *b = vb;
- case CATTA_ENTRY_GROUP_UNCOMMITED:
- case CATTA_ENTRY_GROUP_REGISTERING:
- break;
+ if(a->index != b->index) {
+ return a->index - b->index;
}
+
+ return sockaddrcmp_noport(&a->address, &b->address);
}
+static void send_mdns_packet_ipv4(meshlink_handle_t *mesh, int fd, int index, const sockaddr_t *src, const sockaddr_t *dest, void *data, size_t len) {
+#ifdef IP_PKTINFO
+ struct iovec iov = {
+ .iov_base = data,
+ .iov_len = len,
+ };
-static void discovery_create_services(meshlink_handle_t *mesh) {
- char *fingerprint = NULL;
- char *txt_name = NULL;
- char *txt_fingerprint = NULL;
+ struct in_pktinfo pkti = {
+ .ipi_ifindex = index,
+ .ipi_addr = src->in.sin_addr,
+ };
- assert(mesh);
- assert(mesh->name);
- assert(mesh->myport);
- assert(mesh->catta_server);
- assert(mesh->catta_poll);
- assert(mesh->catta_servicetype);
- assert(mesh->self);
-
- logger(mesh, MESHLINK_DEBUG, "Adding service\n");
-
- /* If this is the first time we're called, let's create a new entry group */
- if(!(mesh->catta_group = catta_s_entry_group_new(mesh->catta_server, discovery_entry_group_callback, mesh))) {
- logger(mesh, MESHLINK_ERROR, "catta_entry_group_new() failed: %s\n", catta_strerror(catta_server_errno(mesh->catta_server)));
- goto fail;
- }
+ union {
+ char buf[CMSG_SPACE(sizeof(pkti))];
+ struct cmsghdr align;
+ } u;
+
+ struct msghdr msg = {
+ .msg_name = (struct sockaddr *) &dest->sa,
+ .msg_namelen = SALEN(dest->sa),
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ .msg_control = u.buf,
+ .msg_controllen = sizeof(u.buf),
+ };
- /* Create txt records */
- fingerprint = meshlink_get_fingerprint(mesh, (meshlink_node_t *)mesh->self);
- xasprintf(&txt_name, "%s=%s", MESHLINK_MDNS_NAME_KEY, mesh->name);
- xasprintf(&txt_fingerprint, "%s=%s", MESHLINK_MDNS_FINGERPRINT_KEY, fingerprint);
- /* Add the service */
- int ret = 0;
+ struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg);
+ cmsg->cmsg_level = IPPROTO_IP;
+ cmsg->cmsg_type = IP_PKTINFO;
+ cmsg->cmsg_len = CMSG_LEN(sizeof(pkti));
+ memcpy(CMSG_DATA(cmsg), &pkti, sizeof(pkti));
- if((ret = catta_server_add_service(mesh->catta_server, mesh->catta_group, CATTA_IF_UNSPEC, CATTA_PROTO_UNSPEC, 0, fingerprint, mesh->catta_servicetype, NULL, NULL, atoi(mesh->myport), txt_name, txt_fingerprint, NULL)) < 0) {
- logger(mesh, MESHLINK_ERROR, "Failed to add service: %s\n", catta_strerror(ret));
- goto fail;
- }
+ // Send the packet
+ ssize_t result = sendmsg(fd, &msg, MSG_DONTWAIT | MSG_NOSIGNAL);
+#else
+ // Send the packet
+ ssize_t result = sendto(fd, data, len, MSG_DONTWAIT | MSG_NOSIGNAL, &dest->sa, SALEN(dest->sa));
+#endif
- /* Tell the server to register the service */
- if((ret = catta_s_entry_group_commit(mesh->catta_group)) < 0) {
- logger(mesh, MESHLINK_ERROR, "Failed to commit entry_group: %s\n", catta_strerror(ret));
- goto fail;
+ if(result <= 0) {
+ logger(mesh, MESHLINK_ERROR, "Error sending multicast packet: %s", strerror(errno));
}
-
- goto done;
-
-fail:
- catta_simple_poll_quit(mesh->catta_poll);
-
-done:
- free(fingerprint);
- free(txt_name);
- free(txt_fingerprint);
}
-static void discovery_server_callback(CattaServer *server, CattaServerState state, void *userdata) {
- (void)server;
- meshlink_handle_t *mesh = userdata;
-
- assert(mesh);
-
- 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 */
- if(pthread_mutex_lock(&mesh->mutex) != 0) {
- abort();
- }
-
- if(!mesh->catta_group) {
- discovery_create_services(mesh);
- }
-
- pthread_mutex_unlock(&mesh->mutex);
-
- break;
+static void send_mdns_packet_ipv6(meshlink_handle_t *mesh, int fd, int index, const sockaddr_t *src, const sockaddr_t *dest, void *data, size_t len) {
+#ifdef IPV6_PKTINFO
+ struct iovec iov = {
+ .iov_base = data,
+ .iov_len = len,
+ };
- case CATTA_SERVER_COLLISION: {
- /* A host name collision happened. Let's pick a new name for the server */
- char hostname[17];
- generate_rand_string(mesh, hostname, sizeof(hostname));
+ struct in6_pktinfo pkti = {
+ .ipi6_ifindex = index,
+ .ipi6_addr = src->in6.sin6_addr,
+ };
- if(pthread_mutex_lock(&mesh->mutex) != 0) {
- abort();
- }
+ union {
+ char buf[CMSG_SPACE(sizeof(pkti))];
+ struct cmsghdr align;
+ } u;
- assert(mesh->catta_server);
- assert(mesh->catta_poll);
+ memset(&u, 0, sizeof u);
- int result = catta_server_set_host_name(mesh->catta_server, hostname);
+ struct msghdr msg = {
+ .msg_name = (struct sockaddr *) &dest->sa,
+ .msg_namelen = SALEN(dest->sa),
+ .msg_iov = &iov,
+ .msg_iovlen = 1,
+ .msg_control = u.buf,
+ .msg_controllen = CMSG_LEN(sizeof(pkti)),
+ };
- if(result < 0) {
- catta_simple_poll_quit(mesh->catta_poll);
- }
+ struct cmsghdr *cmsg = CMSG_FIRSTHDR(&msg);
+ cmsg->cmsg_level = IPPROTO_IPV6;
+ cmsg->cmsg_type = IPV6_PKTINFO;
+ cmsg->cmsg_len = CMSG_LEN(sizeof(pkti));
+ memcpy(CMSG_DATA(cmsg), &pkti, sizeof(pkti));
+
+ // Send the packet
+ ssize_t result = sendmsg(fd, &msg, MSG_DONTWAIT | MSG_NOSIGNAL);
+#else
+ // Send the packet
+ ssize_t result = sendto(fd, data, len, MSG_DONTWAIT | MSG_NOSIGNAL, &dest->sa, SALEN(dest->sa));
+#endif
- pthread_mutex_unlock(&mesh->mutex);
+ if(result <= 0) {
+ logger(mesh, MESHLINK_ERROR, "Error sending multicast packet: %s", strerror(errno));
}
- break;
+}
- case CATTA_SERVER_REGISTERING:
- if(pthread_mutex_lock(&mesh->mutex) != 0) {
- abort();
- }
+static void send_mdns_packet(meshlink_handle_t *mesh, const discovery_address_t *addr) {
+ char *host = NULL, *port = NULL;
+ sockaddr2str(&addr->address, &host, &port);
+ fprintf(stderr, "Sending on iface %d %s port %s\n", addr->index, host, port);
+ free(host);
+ free(port);
- /* Let's drop our registered services. When the server is back
- * in CATTA_SERVER_RUNNING state we will register them
- * again with the new host name. */
- if(mesh->catta_group) {
- catta_s_entry_group_reset(mesh->catta_group);
- mesh->catta_group = NULL;
+ // Configure the socket to send the packet to the right interface
+ int fd;
+ uint8_t data[1024];
+ char *fingerprint = meshlink_get_fingerprint(mesh, (meshlink_node_t *)mesh->self);
+ const char *keys[] = {MESHLINK_MDNS_NAME_KEY, MESHLINK_MDNS_FINGERPRINT_KEY};
+ const char *values[] = {mesh->name, fingerprint};
+ size_t size = prepare_packet(data, sizeof data, fingerprint, mesh->appname, "tcp", atoi(mesh->myport), 2, keys, values);
+
+ switch(addr->address.sa.sa_family) {
+ case AF_INET:
+ fd = mesh->discovery_sockets[0].fd;
+#ifdef IP_MULTICAST_IF
+ {
+ struct ip_mreqn mreq = {
+ .imr_address = addr->address.in.sin_addr,
+ .imr_ifindex = addr->index,
+ };
+
+ if(setsockopt(fd, IPPROTO_IP, IP_MULTICAST_IF, &mreq, sizeof(mreq)) != 0) {
+ logger(mesh, MESHLINK_ERROR, "Could not set outgoing multicast interface on IPv4 socket");
+ return;
+ }
}
- pthread_mutex_unlock(&mesh->mutex);
+#endif
+ send_mdns_packet_ipv4(mesh, fd, addr->index, &addr->address, &mdns_address_ipv4, data, size);
break;
- case CATTA_SERVER_FAILURE:
- if(pthread_mutex_lock(&mesh->mutex) != 0) {
- abort();
- }
+ case AF_INET6:
+ fd = mesh->discovery_sockets[1].fd;
+#ifdef IPV6_MULTICAST_IF
- assert(mesh->catta_server);
- assert(mesh->catta_poll);
+ if(setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_IF, &addr->index, sizeof(addr->index)) != 0) {
+ logger(mesh, MESHLINK_ERROR, "Could not set outgoing multicast interface on IPv6 socket");
+ return;
+ }
- /* Terminate on failure */
- catta_simple_poll_quit(mesh->catta_poll);
+#endif
- pthread_mutex_unlock(&mesh->mutex);
+ send_mdns_packet_ipv6(mesh, fd, addr->index, &addr->address, &mdns_address_ipv6, data, size);
break;
- case CATTA_SERVER_INVALID:
+ default:
break;
}
}
-static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfIndex interface_, CattaProtocol protocol, CattaResolverEvent event, const char *name, const char *type, const char *domain, const char *host_name, const CattaAddress *address, uint16_t port, CattaStringList *txt, CattaLookupResultFlags flags, void *userdata) {
- (void)interface_;
- (void)protocol;
+static void mdns_io_handler(event_loop_t *loop, void *data, int flags) {
(void)flags;
- (void)name;
- (void)type;
- (void)domain;
- (void)host_name;
-
- meshlink_handle_t *mesh = userdata;
-
- assert(mesh);
+ meshlink_handle_t *mesh = loop->data;
+ io_t *io = data;
+ uint8_t buf[1024];
+ sockaddr_t sa;
+ socklen_t sl = sizeof(sa);
+
+ ssize_t len = recvfrom(io->fd, buf, sizeof(buf), MSG_DONTWAIT, &sa.sa, &sl);
+
+ if(len == -1) {
+ if(!sockwouldblock(errno)) {
+ fprintf(stderr, "Error reading from discovery socket: %s\n", strerror(errno));
+ logger(mesh, MESHLINK_ERROR, "Error reading from mDNS discovery socket: %s", strerror(errno));
+ io_set(loop, io, 0);
+ }
- if(event != CATTA_RESOLVER_FOUND) {
- catta_s_service_resolver_free(resolver);
return;
}
- // retrieve fingerprint
- CattaStringList *node_name_li = catta_string_list_find(txt, MESHLINK_MDNS_NAME_KEY);
- CattaStringList *node_fp_li = catta_string_list_find(txt, MESHLINK_MDNS_FINGERPRINT_KEY);
-
- if(node_name_li && node_fp_li) {
- char *node_name = (char *)catta_string_list_get_text(node_name_li) + strlen(MESHLINK_MDNS_NAME_KEY);
- char *node_fp = (char *)catta_string_list_get_text(node_fp_li) + strlen(MESHLINK_MDNS_FINGERPRINT_KEY);
+ char *name = NULL;
+ uint16_t port = 0;
+ const char *keys[2] = {MESHLINK_MDNS_NAME_KEY, MESHLINK_MDNS_FINGERPRINT_KEY};
+ char *values[2] = {NULL, NULL};
- if(node_name[0] == '=' && node_fp[0] == '=') {
- if(pthread_mutex_lock(&mesh->mutex) != 0) {
- abort();
- }
+ if(parse_packet(buf, len, &name, mesh->appname, "tcp", &port, 2, keys, values)) {
+ node_t *n = (node_t *)meshlink_get_node(mesh, values[0]);
- node_name += 1;
+ if(n) {
+ logger(mesh, MESHLINK_INFO, "Node %s is part of the mesh network.\n", n->name);
- meshlink_node_t *node = meshlink_get_node(mesh, node_name);
-
- if(node) {
- logger(mesh, MESHLINK_INFO, "Node %s is part of the mesh network.\n", node->name);
-
- sockaddr_t naddress;
- memset(&naddress, 0, sizeof(naddress));
-
- switch(address->proto) {
- case CATTA_PROTO_INET: {
- naddress.in.sin_family = AF_INET;
- naddress.in.sin_port = htons(port);
- naddress.in.sin_addr.s_addr = address->data.ipv4.address;
- }
+ switch(sa.sa.sa_family) {
+ case AF_INET:
+ sa.in.sin_port = port;
break;
- case CATTA_PROTO_INET6: {
- naddress.in6.sin6_family = AF_INET6;
- naddress.in6.sin6_port = htons(port);
- memcpy(naddress.in6.sin6_addr.s6_addr, address->data.ipv6.address, sizeof(naddress.in6.sin6_addr.s6_addr));
- }
+ case AF_INET6:
+ sa.in6.sin6_port = port;
break;
- default:
- naddress.unknown.family = AF_UNKNOWN;
- break;
- }
-
- if(naddress.unknown.family != AF_UNKNOWN) {
- node_t *n = (node_t *)node;
- connection_t *c = n->connection;
+ default:
+ logger(mesh, MESHLINK_WARNING, "Could not resolve node %s to a known address family type.\n", n->name);
+ sa.sa.sa_family = AF_UNKNOWN;
+ break;
+ }
- n->catta_address = naddress;
- node_add_recent_address(mesh, n, &naddress);
+ if(sa.sa.sa_family != AF_UNKNOWN) {
+ n->catta_address = sa;
+ node_add_recent_address(mesh, n, &sa);
- if(c && c->outgoing && !c->status.active) {
- c->outgoing->timeout = 0;
+ connection_t *c = n->connection;
- if(c->outgoing->ev.cb) {
- timeout_set(&mesh->loop, &c->outgoing->ev, &(struct timespec) {
- 0, 0
- });
- }
+ if(c && c->outgoing && !c->status.active) {
+ c->outgoing->timeout = 0;
- c->last_ping_time = -3600;
+ if(c->outgoing->ev.cb) {
+ timeout_set(&mesh->loop, &c->outgoing->ev, &(struct timespec) {
+ 0, 0
+ });
}
- } else {
- logger(mesh, MESHLINK_WARNING, "Could not resolve node %s to a known address family type.\n", node->name);
+ c->last_ping_time = -3600;
}
- } else {
- logger(mesh, MESHLINK_WARNING, "Node %s is not part of the mesh network.\n", node_name);
}
-
- pthread_mutex_unlock(&mesh->mutex);
- }
- }
-
- catta_s_service_resolver_free(resolver);
-}
-
-static void discovery_browse_callback(CattaSServiceBrowser *browser, CattaIfIndex interface_, CattaProtocol protocol, CattaBrowserEvent event, const char *name, const char *type, const char *domain, CattaLookupResultFlags flags, void *userdata) {
- (void)browser;
- (void)flags;
- meshlink_handle_t *mesh = userdata;
-
- /* Called whenever a new services becomes available on the LAN or is removed from the LAN */
- switch(event) {
- case CATTA_BROWSER_FAILURE:
- if(pthread_mutex_lock(&mesh->mutex) != 0) {
- abort();
- }
-
- catta_simple_poll_quit(mesh->catta_poll);
- pthread_mutex_unlock(&mesh->mutex);
- break;
-
- case CATTA_BROWSER_NEW:
- 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->mutex);
- break;
-
- case CATTA_BROWSER_REMOVE:
- if(pthread_mutex_lock(&mesh->mutex) != 0) {
- abort();
- }
-
- handle_network_change(mesh, --mesh->catta_interfaces);
- pthread_mutex_unlock(&mesh->mutex);
- break;
-
- case CATTA_BROWSER_ALL_FOR_NOW:
- case CATTA_BROWSER_CACHE_EXHAUSTED:
- break;
- }
-}
-
-static void discovery_log_cb(CattaLogLevel level, const char *txt) {
- meshlink_log_level_t mlevel = MESHLINK_CRITICAL;
-
- switch(level) {
- case CATTA_LOG_ERROR:
- mlevel = MESHLINK_ERROR;
- break;
-
- case CATTA_LOG_WARN:
- mlevel = MESHLINK_WARNING;
- break;
-
- case CATTA_LOG_NOTICE:
- case CATTA_LOG_INFO:
- mlevel = MESHLINK_INFO;
- break;
-
- case CATTA_LOG_DEBUG:
- default:
- mlevel = MESHLINK_DEBUG;
- break;
- }
-
- logger(NULL, mlevel, "%s\n", txt);
-}
-
-static void *discovery_loop(void *userdata) {
- bool status = false;
- 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);
-
- // create service type string
- char appname[strlen(mesh->appname) + 2];
- strcpy(appname, mesh->appname);
-
- for(char *p = appname; *p; p++) {
- if(!isalnum(*p) && *p != '_' && *p != '-') {
- *p = '_';
+ } else {
+ logger(mesh, MESHLINK_WARNING, "Node %s is not part of the mesh network.\n", values[0]);
}
- }
-
- if(!appname[1]) {
- appname[1] = '_';
- appname[2] = '\0';
- }
-
- size_t servicetype_strlen = sizeof(MESHLINK_MDNS_SERVICE_TYPE) + strlen(appname) + 1;
- mesh->catta_servicetype = malloc(servicetype_strlen);
- if(mesh->catta_servicetype == NULL) {
- logger(mesh, MESHLINK_ERROR, "Failed to allocate memory for service type string.\n");
- goto fail;
+ fprintf(stderr, "Got packet from %s port %u\n%s=%s\n%s=%s\n", name, port, keys[0], values[0], keys[1], values[1]);
}
- snprintf(mesh->catta_servicetype, servicetype_strlen, MESHLINK_MDNS_SERVICE_TYPE, appname);
+ free(name);
- // Allocate discovery loop object
- if(!(mesh->catta_poll = catta_simple_poll_new())) {
- logger(mesh, MESHLINK_ERROR, "Failed to create discovery poll object.\n");
- goto fail;
+ for(int i = 0; i < 2; i++) {
+ free(values[i]);
}
-
- // generate some unique host name (we actually do not care about it)
- char hostname[17];
- generate_rand_string(mesh, hostname, sizeof(hostname));
-
- // Let's set the host name for this server.
- CattaServerConfig config;
- catta_server_config_init(&config);
- config.host_name = catta_strdup(hostname);
- config.publish_workstation = 0;
- config.disallow_other_stacks = 0;
- 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;
- 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 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;
- }
-
- // Create the service browser
- if(!(mesh->catta_browser = catta_s_service_browser_new(mesh->catta_server, CATTA_IF_UNSPEC, CATTA_PROTO_UNSPEC, mesh->catta_servicetype, NULL, 0, discovery_browse_callback, mesh))) {
- logger(mesh, MESHLINK_ERROR, "Failed to create discovery service browser: %s\n", catta_strerror(catta_server_errno(mesh->catta_server)));
- goto fail;
- }
-
- status = true;
-
-fail:
-
- pthread_cond_broadcast(&mesh->discovery_cond);
- pthread_mutex_unlock(&mesh->discovery_mutex);
-
- if(status) {
- catta_simple_poll_loop(mesh->catta_poll);
- }
-
- if(mesh->catta_browser) {
- catta_s_service_browser_free(mesh->catta_browser);
- mesh->catta_browser = NULL;
- }
-
- if(mesh->catta_group) {
- catta_s_entry_group_reset(mesh->catta_group);
- catta_s_entry_group_free(mesh->catta_group);
- mesh->catta_group = NULL;
- }
-
- if(mesh->catta_server) {
- catta_server_free(mesh->catta_server);
- mesh->catta_server = NULL;
- }
-
- if(mesh->catta_poll) {
- catta_simple_poll_free(mesh->catta_poll);
- mesh->catta_poll = NULL;
- }
-
- if(mesh->catta_servicetype) {
- free(mesh->catta_servicetype);
- mesh->catta_servicetype = NULL;
- }
-
- return NULL;
-}
-
-typedef struct discovery_address {
- int index;
- bool up;
- sockaddr_t address;
-} discovery_address_t;
-
-static int iface_compare(const void *va, const void *vb) {
- const int *a = va;
- const int *b = vb;
- return *a - *b;
-}
-
-static int address_compare(const void *va, const void *vb) {
- const discovery_address_t *a = va;
- const discovery_address_t *b = vb;
-
- if(a->index != b->index) {
- return a->index - b->index;
- }
-
- return sockaddrcmp_noport(&a->address, &b->address);
-}
-
-static void send_mdns_packet(meshlink_handle_t *mesh, const discovery_address_t *addr) {
- char *host = NULL, *port = NULL;
- sockaddr2str(&addr->address, &host, &port);
- fprintf(stderr, "Sending on iface %d %s port %s\n", addr->index, host, port);
- free(host);
- free(port);
}
static void iface_up(meshlink_handle_t *mesh, int index) {
mesh->discovery_ifaces[mesh->discovery_iface_count - 1] = index;
qsort(mesh->discovery_ifaces, mesh->discovery_iface_count, sizeof(*p), iface_compare);
- for(int i = 0; i < mesh->discovery_iface_count; i++) {
- fprintf(stderr, "%d", mesh->discovery_ifaces[i]);
- }
+ // Add multicast membership
+ struct ip_mreqn mreq4 = {
+ .imr_multiaddr = mdns_address_ipv4.in.sin_addr,
+ .imr_ifindex = index,
+ };
+ setsockopt(mesh->discovery_sockets[0].fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq4, sizeof(mreq4));
+ setsockopt(mesh->discovery_sockets[0].fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mreq4, sizeof(mreq4));
+
+ struct ipv6_mreq mreq6 = {
+ .ipv6mr_multiaddr = mdns_address_ipv6.in6.sin6_addr,
+ .ipv6mr_interface = index,
+ };
+ setsockopt(mesh->discovery_sockets[1].fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6));
+ setsockopt(mesh->discovery_sockets[1].fd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, &mreq6, sizeof(mreq6));
// Send an announcement for all addresses associated with this interface
for(int i = 0; i < mesh->discovery_address_count; i++) {
send_mdns_packet(mesh, &mesh->discovery_addresses[i]);
}
}
+
+ handle_network_change(mesh, true);
}
static void iface_down(meshlink_handle_t *const mesh, int index) {
- int *p = bsearch(&index, mesh->discovery_ifaces, mesh->discovery_iface_count, sizeof(int), iface_compare);
+ int *p = bsearch(&index, mesh->discovery_ifaces, mesh->discovery_iface_count, sizeof(*p), iface_compare);
if(!p) {
return;
}
+ // Drop multicast membership
+ struct ip_mreqn mreq4 = {
+ .imr_multiaddr = mdns_address_ipv4.in.sin_addr,
+ .imr_ifindex = index,
+ };
+ setsockopt(mesh->discovery_sockets[0].fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq4, sizeof(mreq4));
+
+ struct ipv6_mreq mreq6 = {
+ .ipv6mr_multiaddr = mdns_address_ipv6.in6.sin6_addr,
+ .ipv6mr_interface = index,
+ };
+ setsockopt(mesh->discovery_sockets[1].fd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, &mreq6, sizeof(mreq6));
+
fprintf(stderr, "iface %d down\n", index);
- memmove(p, p + 1, --mesh->discovery_iface_count * sizeof(*p));
+ memmove(p, p + 1, (mesh->discovery_ifaces + --mesh->discovery_iface_count - p) * sizeof(*p));
+
+ handle_network_change(mesh, mesh->discovery_iface_count);
}
static void addr_add(meshlink_handle_t *mesh, const discovery_address_t *addr) {
- discovery_address_t *p = bsearch(addr, mesh->discovery_addresses, mesh->discovery_address_count, sizeof(int), address_compare);
+ discovery_address_t *p = bsearch(addr, mesh->discovery_addresses, mesh->discovery_address_count, sizeof(*p), address_compare);
if(p) {
return;
}
- bool up = bsearch(&addr->index, mesh->discovery_ifaces, mesh->discovery_iface_count, sizeof(*p), iface_compare);
+ bool up = bsearch(&addr->index, mesh->discovery_ifaces, mesh->discovery_iface_count, sizeof(int), iface_compare);
char *host = NULL, *port = NULL;
sockaddr2str(&addr->address, &host, &port);
fprintf(stderr, "address %d %s port %s up %d\n", addr->index, host, port, up);
mesh->discovery_addresses = xrealloc(mesh->discovery_addresses, ++mesh->discovery_address_count * sizeof(*p));
mesh->discovery_addresses[mesh->discovery_address_count - 1] = *addr;
- qsort(mesh->discovery_addresses, mesh->discovery_address_count, sizeof(*p), address_compare);
-
mesh->discovery_addresses[mesh->discovery_address_count - 1].up = up;
if(up) {
send_mdns_packet(mesh, &mesh->discovery_addresses[mesh->discovery_address_count - 1]);
}
+
+ qsort(mesh->discovery_addresses, mesh->discovery_address_count, sizeof(*p), address_compare);
}
static void addr_del(meshlink_handle_t *mesh, const discovery_address_t *addr) {
free(host);
free(port);
- memmove(p, p + 1, --mesh->discovery_address_count * sizeof(*p));
+ memmove(p, p + 1, (mesh->discovery_addresses + --mesh->discovery_address_count - p) * sizeof(*p));
}
#if defined(__linux)
logger(mesh, MESHLINK_DEBUG, "discovery_start called\n");
assert(mesh);
- assert(!mesh->catta_poll);
- assert(!mesh->catta_server);
- assert(!mesh->catta_browser);
- 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_cond_wait(&mesh->discovery_cond, &mesh->discovery_mutex);
- pthread_mutex_unlock(&mesh->discovery_mutex);
+ // Set up multicast sockets for mDNS
+ static const int one = 1;
+ static const int ttl = 255;
- mesh->discovery_threadstarted = true;
+ int fd = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+ sockaddr_t sa4 = {
+ .in.sin_family = AF_INET,
+ .in.sin_port = ntohs(5353),
+ };
+ setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
+ bind(fd, &sa4.sa, SALEN(sa4.sa));
+ setsockopt(fd, IPPROTO_IP, IP_MULTICAST_LOOP, &one, sizeof(one));
+ setsockopt(fd, IPPROTO_IP, IP_MULTICAST_TTL, &ttl, sizeof(ttl));
+ io_add(&mesh->loop, &mesh->discovery_sockets[0], mdns_io_handler, &mesh->discovery_sockets[0], fd, IO_READ);
+
+ sockaddr_t sa6 = {
+ .in6.sin6_family = AF_INET6,
+ .in6.sin6_port = ntohs(5353),
+ };
+ fd = socket(AF_INET6, SOCK_DGRAM, IPPROTO_UDP);
+ setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
+ setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &one, sizeof(one));
+ bind(fd, &sa6.sa, SALEN(sa6.sa));
+ setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &one, sizeof(one));
+ setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_HOPS, &ttl, sizeof(ttl));
+ io_add(&mesh->loop, &mesh->discovery_sockets[1], mdns_io_handler, &mesh->discovery_sockets[1], fd, IO_READ);
#if defined(__linux)
int sock = socket(AF_NETLINK, SOCK_DGRAM, NETLINK_ROUTE);
io_del(&mesh->loop, &mesh->pfroute_io);
}
- // Shut down
- if(mesh->catta_poll) {
- catta_simple_poll_quit(mesh->catta_poll);
- }
-
- // Wait for the discovery thread to finish
- if(mesh->discovery_threadstarted == true) {
- if(pthread_join(mesh->discovery_thread, NULL) != 0) {
- abort();
+ for(int i = 0; i < 2; i++) {
+ if(mesh->discovery_sockets[i].cb) {
+ close(mesh->discovery_sockets[i].fd);
+ io_del(&mesh->loop, &mesh->discovery_sockets[i]);
}
-
- mesh->discovery_threadstarted = false;
}
-
- mesh->catta_interfaces = 0;
}
projects / meshlink / blobdiff