]> git.meshlink.io Git - meshlink/blobdiff - src/discovery.c
Don't link with Catta anymore.
[meshlink] / src / discovery.c
index 834822aa341537bc26c33bac6991ca9ebf0e0031..df5dda726f699075ef18751f5a817b8d15fe50d2 100644 (file)
-
+#include "system.h"
+
+#if defined(__APPLE__) || defined(__unix) && !defined(__linux)
+#include <net/route.h>
+#elif defined(__linux)
+#include <asm/types.h>
+#include <net/if.h>
+#include <linux/if_link.h>
+#include <linux/netlink.h>
+#include <linux/rtnetlink.h>
+#endif
+
+#include "mdns.h"
 #include "meshlink_internal.h"
+#include "event.h"
 #include "discovery.h"
+#include "sockaddr.h"
+#include "logger.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"
 
-#include <pthread.h>
+static const sockaddr_t mdns_address_ipv4 = {
+       .in.sin_family = AF_INET,
+       .in.sin_addr.s_addr = 0xfb0000e0,
+       .in.sin_port = 0xe914,
+};
+
+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,
+};
+
+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;
+}
 
-#include <avahi-core/core.h>
-#include <avahi-core/lookup.h>
-#include <avahi-core/publish.h>
-#include <avahi-common/simple-watch.h>
-#include <avahi-common/malloc.h>
-#include <avahi-common/alternative.h>
-#include <avahi-common/error.h>
+static int address_compare(const void *va, const void *vb) {
+       const discovery_address_t *a = va;
+       const discovery_address_t *b = vb;
 
-#define MESHLINK_MDNS_SERVICE_TYPE "_meshlink._tcp"
-//#define MESHLINK_MDNS_SERVICE_NAME "Meshlink"
-#define MESHLINK_MDNS_FINGERPRINT_KEY "fingerprint"
+       if(a->index != b->index) {
+               return a->index - b->index;
+       }
 
-static void discovery_resolve_callback(
-    AvahiSServiceResolver *resolver,
-    AVAHI_GCC_UNUSED AvahiIfIndex interface,
-    AVAHI_GCC_UNUSED AvahiProtocol protocol,
-    AvahiResolverEvent event,
-    const char *name,
-    const char *type,
-    const char *domain,
-    const char *host_name,
-    const AvahiAddress *address,
-    uint16_t port,
-    AvahiStringList *txt,
-    AvahiLookupResultFlags flags,
-    AVAHI_GCC_UNUSED void* userdata)
-{
-
-    meshlink_handle_t *mesh = userdata;
-
-    /* Called whenever a service has been resolved successfully or timed out */
-
-    switch (event)
-    {
-        case AVAHI_RESOLVER_FAILURE:
-            fprintf(stderr, "(Resolver) Failed to resolve service '%s' of type '%s' in domain '%s': %s\n", name, type, domain, avahi_strerror(avahi_server_errno(mesh->avahi_server)));
-            break;
-
-        case AVAHI_RESOLVER_FOUND:
-        {
-            char straddr[AVAHI_ADDRESS_STR_MAX], *strtxt;
-
-            fprintf(stderr, "(Resolver) Service '%s' of type '%s' in domain '%s':\n", name, type, domain);
-
-            avahi_address_snprint(straddr, sizeof(straddr), address);
-            strtxt = avahi_string_list_to_string(txt);
-            fprintf(stderr,
-                    "\t%s:%u (%s)\n"
-                    "\tTXT=%s\n"
-                    "\tcookie is %u\n"
-                    "\tis_local: %i\n"
-                    "\twide_area: %i\n"
-                    "\tmulticast: %i\n"
-                    "\tcached: %i\n",
-                    host_name, port, straddr,
-                    strtxt,
-                    avahi_string_list_get_service_cookie(txt),
-                    !!(flags & AVAHI_LOOKUP_RESULT_LOCAL),
-                    !!(flags & AVAHI_LOOKUP_RESULT_WIDE_AREA),
-                    !!(flags & AVAHI_LOOKUP_RESULT_MULTICAST),
-                    !!(flags & AVAHI_LOOKUP_RESULT_CACHED));
-            avahi_free(strtxt);
-
-            // retrieve fingerprint
-            AvahiStringList *fgli = avahi_string_list_find(txt, MESHLINK_MDNS_FINGERPRINT_KEY);
-            meshlink_node_t *node = meshlink_get_node(mesh, name);
-
-            fprintf(stderr, "%p, %p, %s, %s\n", fgli, node, avahi_string_list_get_text(fgli), meshlink_get_fingerprint(mesh, node));
-
-            if( node && fgli && strcmp(avahi_string_list_get_text(fgli)+strlen(MESHLINK_MDNS_FINGERPRINT_KEY)+1, meshlink_get_fingerprint(mesh, node)) == 0 )
-            {
-                fprintf(stderr, "Node %s is part of the mesh network - updating ip address.\n", node->name);
-            }
-            else
-            {
-                fprintf(stderr, "Node %s is not part of the mesh network - ignoring ip address.\n", node->name);
-            }
-        }
-    }
-
-    avahi_s_service_resolver_free(resolver);
+       return sockaddrcmp_noport(&a->address, &b->address);
 }
 
-static void discovery_entry_group_callback(AvahiServer *server, AvahiSEntryGroup *group, AvahiEntryGroupState state, AVAHI_GCC_UNUSED void *userdata)
-{
-    meshlink_handle_t *mesh = userdata;
-
-    /* Called whenever the entry group state changes */
-    switch (state)
-    {
-        case AVAHI_ENTRY_GROUP_ESTABLISHED:
-            /* The entry group has been established successfully */
-            fprintf(stderr, "Service '%s' successfully established.\n", /*MESHLINK_MDNS_SERVICE_NAME*/ mesh->name);
-            break;
-
-        case AVAHI_ENTRY_GROUP_COLLISION:
-            fprintf(stderr, "Service name collision '%s'\n", /*MESHLINK_MDNS_SERVICE_NAME*/ mesh->name);
-            break;
-
-        case AVAHI_ENTRY_GROUP_FAILURE :
-            fprintf(stderr, "Entry group failure: %s\n", avahi_strerror(avahi_server_errno(mesh->avahi_server)));
-
-            /* Some kind of failure happened while we were registering our services */
-            avahi_simple_poll_quit(mesh->avahi_poll);
-            break;
-
-        case AVAHI_ENTRY_GROUP_UNCOMMITED:
-        case AVAHI_ENTRY_GROUP_REGISTERING:
-            ;
-    }
+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,
+       };
+
+       struct in_pktinfo pkti = {
+               .ipi_ifindex = index,
+               .ipi_addr = src->in.sin_addr,
+       };
+
+       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),
+       };
+
+
+       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));
+
+       // 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
+
+       if(result <= 0) {
+               logger(mesh, MESHLINK_ERROR, "Error sending multicast packet: %s", strerror(errno));
+       }
 }
 
+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,
+       };
+
+       struct in6_pktinfo pkti = {
+               .ipi6_ifindex = index,
+               .ipi6_addr = src->in6.sin6_addr,
+       };
+
+       union {
+               char buf[CMSG_SPACE(sizeof(pkti))];
+               struct cmsghdr align;
+       } u;
+
+       memset(&u, 0, sizeof 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 = CMSG_LEN(sizeof(pkti)),
+       };
+
+       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
+
+       if(result <= 0) {
+               logger(mesh, MESHLINK_ERROR, "Error sending multicast packet: %s", strerror(errno));
+       }
+}
+
+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);
+
+       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;
+                       }
+               }
+
+#endif
+
+               send_mdns_packet_ipv4(mesh, fd, addr->index, &addr->address, &mdns_address_ipv4, data, size);
+               break;
+
+       case AF_INET6:
+               fd = mesh->discovery_sockets[1].fd;
+#ifdef IPV6_MULTICAST_IF
+
+               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;
+               }
+
+#endif
+
+               send_mdns_packet_ipv6(mesh, fd, addr->index, &addr->address, &mdns_address_ipv6, data, size);
+               break;
+
+       default:
+               break;
+       }
+}
+
+static void mdns_io_handler(event_loop_t *loop, void *data, int flags) {
+       (void)flags;
+       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);
+               }
+
+               return;
+       }
+
+       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(parse_packet(buf, len, &name, mesh->appname, "tcp", &port, 2, keys, values)) {
+               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);
 
-static void discovery_create_services(meshlink_handle_t *mesh)
-{
-    fprintf(stderr, "Adding service '%s'\n", /*MESHLINK_MDNS_SERVICE_NAME*/ mesh->name);
+                       switch(sa.sa.sa_family) {
+                       case AF_INET:
+                               sa.in.sin_port = port;
+                               break;
 
-    /* If this is the first time we're called, let's create a new entry group */
-    if (!mesh->avahi_group)
-        if (!(mesh->avahi_group = avahi_s_entry_group_new(mesh->avahi_server, discovery_entry_group_callback, mesh))) {
-            fprintf(stderr, "avahi_entry_group_new() failed: %s\n", avahi_strerror(avahi_server_errno(mesh->avahi_server)));
-            goto fail;
-        }
+                       case AF_INET6:
+                               sa.in6.sin6_port = port;
+                               break;
 
-    /* Create some random TXT data */
-    char fingerprint[1024] = "";
-    snprintf(fingerprint, sizeof(fingerprint), "%s=%s", MESHLINK_MDNS_FINGERPRINT_KEY, meshlink_get_fingerprint(mesh, meshlink_get_node(mesh, mesh->name)));
+                       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;
+                       }
 
-    /* Add the service for IPP */
-    int ret = 0;
-    if ((ret = avahi_server_add_service(mesh->avahi_server, mesh->avahi_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, /*MESHLINK_MDNS_SERVICE_NAME*/ mesh->name, MESHLINK_MDNS_SERVICE_TYPE, NULL, NULL, mesh->myport ? atoi(mesh->myport) : 655, fingerprint, NULL)) < 0) {
-        fprintf(stderr, "Failed to add _ipp._tcp service: %s\n", avahi_strerror(ret));
-        goto fail;
-    }
+                       if(sa.sa.sa_family != AF_UNKNOWN) {
+                               n->catta_address = sa;
+                               node_add_recent_address(mesh, n, &sa);
 
-    /* Tell the server to register the service */
-    if ((ret = avahi_s_entry_group_commit(mesh->avahi_group)) < 0) {
-        fprintf(stderr, "Failed to commit entry_group: %s\n", avahi_strerror(ret));
-        goto fail;
-    }
+                               connection_t *c = n->connection;
 
-    return;
+                               if(c && c->outgoing && !c->status.active) {
+                                       c->outgoing->timeout = 0;
 
-fail:
-    avahi_simple_poll_quit(mesh->avahi_poll);
+                                       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, "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);
+
+       for(int i = 0; i < 2; i++) {
+               free(values[i]);
+       }
 }
 
-static void discovery_server_callback(AvahiServer *server, AvahiServerState state, AVAHI_GCC_UNUSED void * userdata)
-{
-       meshlink_handle_t *mesh = userdata;
-
-    switch (state)
-    {
-        case AVAHI_SERVER_RUNNING:
-            /* The serve has startup successfully and registered its host
-             * name on the network, so it's time to create our services */
-            if (!mesh->avahi_group)
-                discovery_create_services(mesh);
-            break;
-
-        case AVAHI_SERVER_COLLISION:
-            /* A host name collision happened. Let's do nothing */
-            break;
-
-        case AVAHI_SERVER_REGISTERING:
-               /* Let's drop our registered services. When the server is back
-             * in AVAHI_SERVER_RUNNING state we will register them
-             * again with the new host name. */
-            //if (mesh->avahi_group)
-            //    avahi_s_entry_group_reset(mesh->avahi_group);
-            break;
-
-        case AVAHI_SERVER_FAILURE:
-            /* Terminate on failure */
-            fprintf(stderr, "Server failure: %s\n", avahi_strerror(avahi_server_errno(mesh->avahi_server)));
-            avahi_simple_poll_quit(mesh->avahi_poll);
-            break;
-
-        case AVAHI_SERVER_INVALID:
-            break;
-    }
+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);
+
+       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);
+
+       // 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++) {
+               if(mesh->discovery_addresses[i].index == index) {
+                       send_mdns_packet(mesh, &mesh->discovery_addresses[i]);
+               }
+       }
+
+       handle_network_change(mesh, true);
 }
 
-static void discovery_browse_callback(
-    AvahiSServiceBrowser *browser,
-    AvahiIfIndex interface,
-    AvahiProtocol protocol,
-    AvahiBrowserEvent event,
-    const char *name,
-    const char *type,
-    const char *domain,
-    AVAHI_GCC_UNUSED AvahiLookupResultFlags flags,
-    void* userdata)
-{
-       meshlink_handle_t *mesh = userdata;
-
-    /* Called whenever a new services becomes available on the LAN or is removed from the LAN */
-
-    switch (event)
-    {
-        case AVAHI_BROWSER_FAILURE:
-            fprintf(stderr, "(Browser) %s\n", avahi_strerror(avahi_server_errno(mesh->avahi_server)));
-            avahi_simple_poll_quit(mesh->avahi_poll);
-            return;
-
-        case AVAHI_BROWSER_NEW:
-            fprintf(stderr, "(Browser) NEW: service '%s' of type '%s' in domain '%s'\n", name, type, domain);
-            /* We ignore the returned resolver object. In the callback
-               function we free it. If the server is terminated before
-               the callback function is called the server will free
-               the resolver for us. */
-            if (!(avahi_s_service_resolver_new(mesh->avahi_server, interface, protocol, name, type, domain, AVAHI_PROTO_UNSPEC, 0, discovery_resolve_callback, mesh)))
-                fprintf(stderr, "Failed to resolve service '%s': %s\n", name, avahi_strerror(avahi_server_errno(mesh->avahi_server)));
-            break;
-
-        case AVAHI_BROWSER_REMOVE:
-            fprintf(stderr, "(Browser) REMOVE: service '%s' of type '%s' in domain '%s'\n", name, type, domain);
-            break;
-
-        case AVAHI_BROWSER_ALL_FOR_NOW:
-        case AVAHI_BROWSER_CACHE_EXHAUSTED:
-            fprintf(stderr, "(Browser) %s\n", event == AVAHI_BROWSER_CACHE_EXHAUSTED ? "CACHE_EXHAUSTED" : "ALL_FOR_NOW");
-            break;
-    }
+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);
+
+       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_ifaces + --mesh->discovery_iface_count - p) * sizeof(*p));
+
+       handle_network_change(mesh, mesh->discovery_iface_count);
 }
 
-static void *discovery_loop(void *arg)
-{
-       meshlink_handle_t *mesh = arg;
+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);
 
-    avahi_simple_poll_loop(mesh->avahi_poll);
+       if(p) {
+               return;
+       }
 
-       return NULL;
+       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);
+
+       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]);
+       }
+
+       qsort(mesh->discovery_addresses, mesh->discovery_address_count, sizeof(*p), address_compare);
 }
 
-bool discovery_start(meshlink_handle_t *mesh)
-{
-    // Allocate discovery loop object
-    if (!(mesh->avahi_poll = avahi_simple_poll_new())) {
-        fprintf(stderr, "Failed to create discovery poll object.\n");
-               goto fail;
-    }
-
-    // Let's set the host name for this server.
-    AvahiServerConfig config;
-    avahi_server_config_init(&config);
-    config.host_name = avahi_strdup(mesh->name);
-    config.publish_workstation = 0;
-
-    /* Allocate a new server */
-    int error;
-    mesh->avahi_server = avahi_server_new(avahi_simple_poll_get(mesh->avahi_poll), &config, discovery_server_callback, mesh, &error);
-
-    /* Free the configuration data */
-    avahi_server_config_free(&config);
-
-    /* Check wether creating the server object succeeded */
-    if (!mesh->avahi_server) {
-        fprintf(stderr, "Failed to create discovery server: %s\n", avahi_strerror(error));
-        goto fail;
-    }
-
-    // Create the service browser
-    if (!(mesh->avahi_browser = avahi_s_service_browser_new(mesh->avahi_server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, MESHLINK_MDNS_SERVICE_TYPE, NULL, 0, discovery_browse_callback, mesh))) {
-        fprintf(stderr, "Failed to create discovery service browser: %s\n", avahi_strerror(avahi_server_errno(mesh->avahi_server)));
-        goto fail;
-    }
-
-       // Start the discovery thread
-       if(pthread_create(&mesh->discovery_thread, NULL, discovery_loop, mesh) != 0) {
-               fprintf(stderr, "Could not start discovery thread: %s\n", strerror(errno));
-               memset(&mesh->discovery_thread, 0, sizeof mesh->discovery_thread);
-               goto fail;
+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);
+
+       if(!p) {
+               return;
        }
 
-       mesh->discovery_threadstarted = true;
+       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);
 
-       return true;
+       memmove(p, p + 1, (mesh->discovery_addresses + --mesh->discovery_address_count - p) * sizeof(*p));
+}
+
+#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) {
+               iface_up(mesh, ifi->ifi_index);
+       } else {
+               iface_down(mesh, 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) {
+                       discovery_address_t addr  = {
+                               .index = ifa->ifa_index,
+                       };
+
+                       if(rta->rta_len == 8) {
+                               addr.address.sa.sa_family = AF_INET;
+                               memcpy(&addr.address.in.sin_addr, ptr + 4, 4);
+                               addr.address.in.sin_port = 5353;
+                       } else if(rta->rta_len == 20) {
+                               addr.address.sa.sa_family = AF_INET6;
+                               memcpy(&addr.address.in6.sin6_addr, ptr + 4, 16);
+                               addr.address.in6.sin6_port = 5353;
+                               addr.address.in6.sin6_scope_id = ifa->ifa_index;
+                       } else {
+                               addr.address.sa.sa_family = AF_UNKNOWN;
+                       }
+
+                       if(addr.address.sa.sa_family != AF_UNKNOWN) {
+                               if(nlm->nlmsg_type == RTM_NEWADDR) {
+                                       addr_add(mesh, &addr);
+                               } else {
+                                       addr_del(mesh, &addr);
+                               }
+                       }
+               }
+
+               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;
 
-fail:
-    if (mesh->avahi_browser)
-        avahi_s_service_browser_free(mesh->avahi_browser);
+               if(nlm->nlmsg_len > len) {
+                       break;
+               }
 
-    if (mesh->avahi_server)
-        avahi_server_free(mesh->avahi_server);
+               switch(nlm->nlmsg_type) {
+               case RTM_NEWLINK:
+               case RTM_DELLINK:
+                       netlink_parse_link(mesh, nlm);
+                       break;
 
-    if (mesh->avahi_poll)
-        avahi_simple_poll_free(mesh->avahi_poll);
+               case RTM_NEWADDR:
+               case RTM_DELADDR:
+                       netlink_parse_addr(mesh, nlm);
+               }
 
-    return false;
+               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");
+
+       assert(mesh);
+
+       // Set up multicast sockets for mDNS
+       static const int one = 1;
+       static const int ttl = 255;
+
+       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);
+
+       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);
 
-void discovery_stop(meshlink_handle_t *mesh)
-{
-       // @TODO: Shut down 
-       avahi_simple_poll_quit(mesh->avahi_poll);
+       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));
+       }
 
-       // Wait for the discovery thread to finish
+#endif
 
-       pthread_join(mesh->discovery_thread, NULL);
+       return true;
+}
 
-       // Clean up resources
-    if (mesh->avahi_browser)
-        avahi_s_service_browser_free(mesh->avahi_browser);
+void discovery_stop(meshlink_handle_t *mesh) {
+       logger(mesh, MESHLINK_DEBUG, "discovery_stop called\n");
 
-    if (mesh->avahi_server)
-        avahi_server_free(mesh->avahi_server);
+       assert(mesh);
 
-    if (mesh->avahi_poll)
-        avahi_simple_poll_free(mesh->avahi_poll);
+       free(mesh->discovery_ifaces);
+       free(mesh->discovery_addresses);
+       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);
+       }
+
+       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]);
+               }
+       }
 }