X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdiscovery.c;h=6fec9a2466299592fb51b6f6cf47e145723416b5;hb=244c5cd1dba4efdfd54aee505baaccf050900c07;hp=36d202bde9b192852370e0fc58c53fd9d95ae2b3;hpb=9984c2d2263bf2a88075b7b381cfe5838441d275;p=meshlink

diff --git a/src/discovery.c b/src/discovery.c
index 36d202bd..6fec9a24 100644
--- a/src/discovery.c
+++ b/src/discovery.c
@@ -1,14 +1,5 @@
 #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)
@@ -49,474 +40,6 @@ static const sockaddr_t mdns_address_ipv6 = {
 	.in6.sin6_port = 0xe914,
 };
 
-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);
-	}
-
-	buffer[size - 1] = '\0';
-}
-
-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;
-
-	case CATTA_ENTRY_GROUP_COLLISION:
-		logger(mesh, MESHLINK_WARNING, "Catta Service collision.\n");
-		// @TODO can we just set a new name and retry?
-		break;
-
-	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;
-
-	case CATTA_ENTRY_GROUP_UNCOMMITED:
-	case CATTA_ENTRY_GROUP_REGISTERING:
-		break;
-	}
-}
-
-
-static void discovery_create_services(meshlink_handle_t *mesh) {
-	char *fingerprint = NULL;
-	char *txt_name = NULL;
-	char *txt_fingerprint = NULL;
-
-	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;
-	}
-
-	/* 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;
-
-	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;
-	}
-
-	/* 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;
-	}
-
-	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;
-
-	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));
-
-		if(pthread_mutex_lock(&mesh->mutex) != 0) {
-			abort();
-		}
-
-		assert(mesh->catta_server);
-		assert(mesh->catta_poll);
-
-		int result = catta_server_set_host_name(mesh->catta_server, hostname);
-
-		if(result < 0) {
-			catta_simple_poll_quit(mesh->catta_poll);
-		}
-
-		pthread_mutex_unlock(&mesh->mutex);
-	}
-	break;
-
-	case CATTA_SERVER_REGISTERING:
-		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
-		 * again with the new host name. */
-		if(mesh->catta_group) {
-			catta_s_entry_group_reset(mesh->catta_group);
-			mesh->catta_group = NULL;
-		}
-
-		pthread_mutex_unlock(&mesh->mutex);
-
-		break;
-
-	case CATTA_SERVER_FAILURE:
-		if(pthread_mutex_lock(&mesh->mutex) != 0) {
-			abort();
-		}
-
-		assert(mesh->catta_server);
-		assert(mesh->catta_poll);
-
-		/* Terminate on failure */
-		catta_simple_poll_quit(mesh->catta_poll);
-
-		pthread_mutex_unlock(&mesh->mutex);
-		break;
-
-	case CATTA_SERVER_INVALID:
-		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;
-	(void)flags;
-	(void)name;
-	(void)type;
-	(void)domain;
-	(void)host_name;
-
-	meshlink_handle_t *mesh = userdata;
-
-	assert(mesh);
-
-	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);
-
-		if(node_name[0] == '=' && node_fp[0] == '=') {
-			if(pthread_mutex_lock(&mesh->mutex) != 0) {
-				abort();
-			}
-
-			node_name += 1;
-
-			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;
-				}
-				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));
-				}
-				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;
-
-					n->catta_address = naddress;
-					node_add_recent_address(mesh, n, &naddress);
-
-					if(c && c->outgoing && !c->status.active) {
-						c->outgoing->timeout = 0;
-
-						if(c->outgoing->ev.cb) {
-							timeout_set(&mesh->loop, &c->outgoing->ev, &(struct timespec) {
-								0, 0
-							});
-						}
-
-						c->last_ping_time = -3600;
-					}
-
-				} else {
-					logger(mesh, MESHLINK_WARNING, "Could not resolve node %s to a known address family type.\n", node->name);
-				}
-			} 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();
-	}
-
-#if 1
-	// bypass Catta
-	pthread_cond_broadcast(&mesh->discovery_cond);
-	pthread_mutex_unlock(&mesh->discovery_mutex);
-	return NULL;
-#endif
-
-	// 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 = '_';
-		}
-	}
-
-	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;
-	}
-
-	snprintf(mesh->catta_servicetype, servicetype_strlen, MESHLINK_MDNS_SERVICE_TYPE, appname);
-
-	// 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;
-	}
-
-	// 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;
@@ -632,23 +155,18 @@ static void send_mdns_packet_ipv6(meshlink_handle_t *mesh, int fd, int index, co
 }
 
 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);
-
 	// 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);
+	size_t size = prepare_packet(data, sizeof data, fingerprint, mesh->appname, "tcp", atoi(mesh->myport), 2, keys, values, false);
+	free(fingerprint);
 
 	switch(addr->address.sa.sa_family) {
 	case AF_INET:
-		fd = mesh->discovery_sockets[0].fd;
+		fd = mesh->discovery.sockets[0].fd;
 #ifdef IP_MULTICAST_IF
 		{
 			struct ip_mreqn mreq = {
@@ -668,7 +186,7 @@ static void send_mdns_packet(meshlink_handle_t *mesh, const discovery_address_t
 		break;
 
 	case AF_INET6:
-		fd = mesh->discovery_sockets[1].fd;
+		fd = mesh->discovery.sockets[1].fd;
 #ifdef IPV6_MULTICAST_IF
 
 		if(setsockopt(fd, IPPROTO_IPV6, IPV6_MULTICAST_IF, &addr->index, sizeof(addr->index)) != 0) {
@@ -698,7 +216,6 @@ static void mdns_io_handler(event_loop_t *loop, void *data, int flags) {
 
 	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);
 		}
@@ -710,20 +227,32 @@ static void mdns_io_handler(event_loop_t *loop, void *data, int flags) {
 	uint16_t port = 0;
 	const char *keys[2] = {MESHLINK_MDNS_NAME_KEY, MESHLINK_MDNS_FINGERPRINT_KEY};
 	char *values[2] = {NULL, NULL};
+	bool response;
 
-	if(parse_packet(buf, len, &name, mesh->appname, "tcp", &port, 2, keys, values)) {
+	if(parse_packet(buf, len, &name, mesh->appname, "tcp", &port, 2, keys, values, &response)) {
 		node_t *n = (node_t *)meshlink_get_node(mesh, values[0]);
 
 		if(n) {
-			logger(mesh, MESHLINK_INFO, "Node %s is part of the mesh network.\n", n->name);
+			if(n != mesh->self) {
+				logger(mesh, MESHLINK_INFO, "Node %s discovered on the local network.\n", n->name);
+			}
+
+			if(!response && n != mesh->self) {
+				// Send a unicast response back
+				char *fingerprint = meshlink_get_fingerprint(mesh, (meshlink_node_t *)mesh->self);
+				const char *response_values[] = {mesh->name, fingerprint};
+				size_t size = prepare_packet(buf, sizeof(buf), fingerprint, mesh->appname, "tcp", atoi(mesh->myport), 2, keys, response_values, true);
+				sendto(io->fd, buf, size, MSG_DONTWAIT | MSG_NOSIGNAL, &sa.sa, sl);
+				free(fingerprint);
+			}
 
 			switch(sa.sa.sa_family) {
 			case AF_INET:
-				sa.in.sin_port = port;
+				sa.in.sin_port = htons(port);
 				break;
 
 			case AF_INET6:
-				sa.in6.sin6_port = port;
+				sa.in6.sin6_port = htons(port);
 				break;
 
 			default:
@@ -734,27 +263,28 @@ static void mdns_io_handler(event_loop_t *loop, void *data, int flags) {
 
 			if(sa.sa.sa_family != AF_UNKNOWN) {
 				n->catta_address = sa;
+				n->last_connect_try = 0;
 				node_add_recent_address(mesh, n, &sa);
 
-				connection_t *c = n->connection;
+				if(n->connection) {
+					n->connection->last_ping_time = -3600;
+				}
 
-				if(c && c->outgoing && !c->status.active) {
-					c->outgoing->timeout = 0;
+				for list_each(outgoing_t, outgoing, mesh->outgoings) {
+					if(outgoing->node != n) {
+						continue;
+					}
+
+					outgoing->timeout = 0;
 
-					if(c->outgoing->ev.cb) {
-						timeout_set(&mesh->loop, &c->outgoing->ev, &(struct timespec) {
+					if(outgoing->ev.cb) {
+						timeout_set(&mesh->loop, &outgoing->ev, &(struct timespec) {
 							0, 0
 						});
 					}
-
-					c->last_ping_time = -3600;
 				}
 			}
-		} else {
-			logger(mesh, MESHLINK_WARNING, "Node %s is not part of the mesh network.\n", values[0]);
 		}
-
-		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]);
 	}
 
 	free(name);
@@ -765,36 +295,35 @@ static void mdns_io_handler(event_loop_t *loop, void *data, int flags) {
 }
 
 static void iface_up(meshlink_handle_t *mesh, int index) {
-	int *p = bsearch(&index, mesh->discovery_ifaces, mesh->discovery_iface_count, sizeof(*p), iface_compare);
+	int *p = bsearch(&index, mesh->discovery.ifaces, mesh->discovery.iface_count, sizeof(*p), iface_compare);
 
 	if(p) {
 		return;
 	}
 
-	fprintf(stderr, "iface %d up\n", index);
-	mesh->discovery_ifaces = xrealloc(mesh->discovery_ifaces, ++mesh->discovery_iface_count * sizeof(*p));
-	mesh->discovery_ifaces[mesh->discovery_iface_count - 1] = index;
-	qsort(mesh->discovery_ifaces, mesh->discovery_iface_count, sizeof(*p), iface_compare);
+	mesh->discovery.ifaces = xrealloc(mesh->discovery.ifaces, ++mesh->discovery.iface_count * sizeof(*p));
+	mesh->discovery.ifaces[mesh->discovery.iface_count - 1] = index;
+	qsort(mesh->discovery.ifaces, mesh->discovery.iface_count, sizeof(*p), iface_compare);
 
 	// 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));
+	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));
+	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++) {
-		if(mesh->discovery_addresses[i].index == index) {
-			send_mdns_packet(mesh, &mesh->discovery_addresses[i]);
+	for(int i = 0; i < mesh->discovery.address_count; i++) {
+		if(mesh->discovery.addresses[i].index == index) {
+			send_mdns_packet(mesh, &mesh->discovery.addresses[i]);
 		}
 	}
 
@@ -802,7 +331,7 @@ static void iface_up(meshlink_handle_t *mesh, int index) {
 }
 
 static void iface_down(meshlink_handle_t *const mesh, int index) {
-	int *p = bsearch(&index, mesh->discovery_ifaces, mesh->discovery_iface_count, sizeof(*p), iface_compare);
+	int *p = bsearch(&index, mesh->discovery.ifaces, mesh->discovery.iface_count, sizeof(*p), iface_compare);
 
 	if(!p) {
 		return;
@@ -813,59 +342,47 @@ static void iface_down(meshlink_handle_t *const mesh, int index) {
 		.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_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));
+	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_ifaces + --mesh->discovery_iface_count - p) * sizeof(*p));
+	memmove(p, p + 1, (mesh->discovery.ifaces + --mesh->discovery.iface_count - p) * sizeof(*p));
 
-	handle_network_change(mesh, mesh->discovery_iface_count);
+	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(*p), 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(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);
-	free(host);
-	free(port);
+	bool up = bsearch(&addr->index, mesh->discovery.ifaces, mesh->discovery.iface_count, sizeof(int), iface_compare);
 
-	mesh->discovery_addresses = xrealloc(mesh->discovery_addresses, ++mesh->discovery_address_count * sizeof(*p));
-	mesh->discovery_addresses[mesh->discovery_address_count - 1] = *addr;
-	mesh->discovery_addresses[mesh->discovery_address_count - 1].up = up;
+	mesh->discovery.addresses = xrealloc(mesh->discovery.addresses, ++mesh->discovery.address_count * sizeof(*p));
+	mesh->discovery.addresses[mesh->discovery.address_count - 1] = *addr;
+	mesh->discovery.addresses[mesh->discovery.address_count - 1].up = up;
 
 	if(up) {
-		send_mdns_packet(mesh, &mesh->discovery_addresses[mesh->discovery_address_count - 1]);
+		send_mdns_packet(mesh, &mesh->discovery.addresses[mesh->discovery.address_count - 1]);
 	}
 
-	qsort(mesh->discovery_addresses, mesh->discovery_address_count, sizeof(*p), address_compare);
+	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) {
-	discovery_address_t *p = bsearch(addr, mesh->discovery_addresses, mesh->discovery_address_count, sizeof(*p), address_compare);
+	discovery_address_t *p = bsearch(addr, mesh->discovery.addresses, mesh->discovery.address_count, sizeof(*p), address_compare);
 
 	if(!p) {
 		return;
 	}
 
-	char *host = NULL, *port = NULL;
-	sockaddr2str(&addr->address, &host, &port);
-	fprintf(stderr, "address %d %s port %s down\n", addr->index, host, port);
-	free(host);
-	free(port);
-
-	memmove(p, p + 1, (mesh->discovery_addresses + --mesh->discovery_address_count - p) * sizeof(*p));
+	memmove(p, p + 1, (mesh->discovery.addresses + --mesh->discovery.address_count - p) * sizeof(*p));
 }
 
 #if defined(__linux)
@@ -897,7 +414,6 @@ static void netlink_getaddr(int fd) {
 	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);
 
@@ -981,8 +497,9 @@ static void netlink_parse(meshlink_handle_t *mesh, const void *data, size_t len)
 
 static void netlink_io_handler(event_loop_t *loop, void *data, int flags) {
 	(void)flags;
+	(void)data;
 	static time_t prev_update;
-	meshlink_handle_t *mesh = data;
+	meshlink_handle_t *mesh = loop->data;
 
 	struct {
 		struct nlmsghdr nlm;
@@ -990,7 +507,7 @@ static void netlink_io_handler(event_loop_t *loop, void *data, int flags) {
 	} msg;
 
 	while(true) {
-		ssize_t result = recv(mesh->pfroute_io.fd, &msg, sizeof(msg), MSG_DONTWAIT);
+		ssize_t result = recv(mesh->discovery.pfroute_io.fd, &msg, sizeof(msg), MSG_DONTWAIT);
 
 		if(result <= 0) {
 			if(result == 0 || errno == EAGAIN || errno == EINTR) {
@@ -998,7 +515,7 @@ static void netlink_io_handler(event_loop_t *loop, void *data, int flags) {
 			}
 
 			logger(mesh, MESHLINK_ERROR, "Reading from Netlink socket failed: %s\n", strerror(errno));
-			io_set(loop, &mesh->pfroute_io, 0);
+			io_set(loop, &mesh->discovery.pfroute_io, 0);
 		}
 
 		if((size_t)result < sizeof(msg.nlm)) {
@@ -1009,7 +526,7 @@ static void netlink_io_handler(event_loop_t *loop, void *data, int flags) {
 		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);
+				netlink_getaddr(mesh->discovery.pfroute_io.fd);
 			}
 		} else {
 			netlink_parse(mesh, &msg, result);
@@ -1024,8 +541,9 @@ static void netlink_io_handler(event_loop_t *loop, void *data, int flags) {
 #elif defined(RTM_NEWADDR)
 static void pfroute_io_handler(event_loop_t *loop, void *data, int flags) {
 	(void)flags;
+	(void)data;
 	static time_t prev_update;
-	meshlink_handle_t *mesh = data;
+	meshlink_handle_t *mesh = loop->data;
 
 	struct {
 		struct rt_msghdr rtm;
@@ -1034,7 +552,7 @@ static void pfroute_io_handler(event_loop_t *loop, void *data, int flags) {
 
 	while(true) {
 		msg.rtm.rtm_version = 0;
-		ssize_t result = recv(mesh->pfroute_io.fd, &msg, sizeof(msg), MSG_DONTWAIT);
+		ssize_t result = recv(mesh->discovery.pfroute_io.fd, &msg, sizeof(msg), MSG_DONTWAIT);
 
 		if(result <= 0) {
 			if(result == 0 || errno == EAGAIN || errno == EINTR) {
@@ -1042,7 +560,7 @@ static void pfroute_io_handler(event_loop_t *loop, void *data, int flags) {
 			}
 
 			logger(mesh, MESHLINK_ERROR, "Reading from PFROUTE socket failed: %s\n", strerror(errno));
-			io_set(loop, &mesh->pfroute_io, 0);
+			io_set(loop, &mesh->discovery.pfroute_io, 0);
 		}
 
 		if(msg.rtm.rtm_version != RTM_VERSION) {
@@ -1072,28 +590,6 @@ bool discovery_start(meshlink_handle_t *mesh) {
 	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);
-
-	mesh->discovery_threadstarted = true;
 
 	// Set up multicast sockets for mDNS
 	static const int one = 1;
@@ -1108,7 +604,7 @@ bool discovery_start(meshlink_handle_t *mesh) {
 	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);
+	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,
@@ -1120,7 +616,7 @@ bool discovery_start(meshlink_handle_t *mesh) {
 	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);
+	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);
@@ -1132,7 +628,7 @@ bool discovery_start(meshlink_handle_t *mesh) {
 		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);
+			io_add(&mesh->loop, &mesh->discovery.pfroute_io, netlink_io_handler, NULL, sock, IO_READ);
 			netlink_getlink(sock);
 		} else {
 			logger(mesh, MESHLINK_WARNING, "Could not bind AF_NETLINK socket: %s", strerror(errno));
@@ -1145,7 +641,7 @@ bool discovery_start(meshlink_handle_t *mesh) {
 	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);
+		io_add(&mesh->loop, &mesh->discovery.pfroute_io, pfroute_io_handler, NULL, sock, IO_READ);
 	} else {
 		logger(mesh, MESHLINK_WARNING, "Could not open PF_ROUTE socket: %s", strerror(errno));
 	}
@@ -1160,36 +656,30 @@ void discovery_stop(meshlink_handle_t *mesh) {
 
 	assert(mesh);
 
-	free(mesh->discovery_ifaces);
-	free(mesh->discovery_addresses);
-	mesh->discovery_iface_count = 0;
-	mesh->discovery_address_count = 0;
+	free(mesh->discovery.ifaces);
+	free(mesh->discovery.addresses);
+	mesh->discovery.ifaces = NULL;
+	mesh->discovery.addresses = NULL;
+	mesh->discovery.iface_count = 0;
+	mesh->discovery.address_count = 0;
 
-	if(mesh->pfroute_io.cb) {
-		close(mesh->pfroute_io.fd);
-		io_del(&mesh->loop, &mesh->pfroute_io);
+	if(mesh->discovery.pfroute_io.cb) {
+		close(mesh->discovery.pfroute_io.fd);
+		io_del(&mesh->loop, &mesh->discovery.pfroute_io);
 	}
 
 	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]);
+		if(mesh->discovery.sockets[i].cb) {
+			close(mesh->discovery.sockets[i].fd);
+			io_del(&mesh->loop, &mesh->discovery.sockets[i]);
 		}
 	}
+}
 
-	// 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();
+void discovery_refresh(meshlink_handle_t *mesh) {
+	for(int i = 0; i < mesh->discovery.address_count; i++) {
+		if(mesh->discovery.addresses[i].up) {
+			send_mdns_packet(mesh, &mesh->discovery.addresses[i]);
 		}
-
-		mesh->discovery_threadstarted = false;
 	}
-
-	mesh->catta_interfaces = 0;
 }