X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdiscovery.c;h=fa4e13c3435ec928e5c2e626e111344509032803;hb=c6cc7da56d108f05ea6f9a2f765f699e6e2353db;hp=ea1f6b73c10df7afd1540e90ce9eaea9ca09fde2;hpb=cdd7f1eb5ce6a34347a3ed57d7cd91cebf166673;p=meshlink diff --git a/src/discovery.c b/src/discovery.c index ea1f6b73..fa4e13c3 100644 --- a/src/discovery.c +++ b/src/discovery.c @@ -2,12 +2,14 @@ #include "meshlink_internal.h" #include "discovery.h" #include "sockaddr.h" +#include "logger.h" #include #include #include #include +#include #include #include #include @@ -17,7 +19,7 @@ #include -#define MESHLINK_MDNS_SERVICE_TYPE "_meshlink._tcp" +#define MESHLINK_MDNS_SERVICE_TYPE "_%s._tcp" #define MESHLINK_MDNS_NAME_KEY "name" #define MESHLINK_MDNS_FINGERPRINT_KEY "fingerprint" @@ -30,22 +32,24 @@ static void discovery_entry_group_callback(AvahiServer *server, AvahiSEntryGroup assert(mesh->avahi_server != NULL); assert(mesh->avahi_poll != NULL); + pthread_mutex_lock(&(mesh->mesh_mutex)); + /* Called whenever the entry group state changes */ switch(state) { case AVAHI_ENTRY_GROUP_ESTABLISHED: /* The entry group has been established successfully */ - fprintf(stderr, "Service successfully established.\n"); + logger(mesh, MESHLINK_DEBUG, "Avahi Service successfully established.\n"); break; case AVAHI_ENTRY_GROUP_COLLISION: - fprintf(stderr, "Service collision\n"); + logger(mesh, MESHLINK_WARNING, "Avahi Service collision.\n"); // @TODO can we just set a new name and retry? break; case AVAHI_ENTRY_GROUP_FAILURE : /* Some kind of failure happened while we were registering our services */ - fprintf(stderr, "Entry group failure: %s\n", avahi_strerror(avahi_server_errno(mesh->avahi_server))); + logger(mesh, MESHLINK_ERROR, "Avahi Entry group failure: %s\n", avahi_strerror(avahi_server_errno(mesh->avahi_server))); avahi_simple_poll_quit(mesh->avahi_poll); break; @@ -53,6 +57,8 @@ static void discovery_entry_group_callback(AvahiServer *server, AvahiSEntryGroup case AVAHI_ENTRY_GROUP_REGISTERING: ; } + + pthread_mutex_unlock(&(mesh->mesh_mutex)); } @@ -66,15 +72,19 @@ static void discovery_create_services(meshlink_handle_t *mesh) assert(mesh->myport != NULL); assert(mesh->avahi_server != NULL); assert(mesh->avahi_poll != NULL); + assert(mesh->avahi_servicetype != NULL); + assert(mesh->self != NULL); - fprintf(stderr, "Adding service\n"); + pthread_mutex_lock(&(mesh->mesh_mutex)); + + logger(mesh, MESHLINK_DEBUG, "Adding service\n"); /* Ifthis 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))); + logger(mesh, MESHLINK_ERROR, "avahi_entry_group_new() failed: %s\n", avahi_strerror(avahi_server_errno(mesh->avahi_server))); goto fail; } } @@ -82,30 +92,30 @@ static void discovery_create_services(meshlink_handle_t *mesh) /* Create txt records */ size_t txt_name_len = sizeof(MESHLINK_MDNS_NAME_KEY) + 1 + strlen(mesh->name) + 1; txt_name = malloc(txt_name_len); + + if(txt_name == NULL) + { + logger(mesh, MESHLINK_ERROR, "Could not allocate memory for TXT record\n"); + goto fail; + } + snprintf(txt_name, txt_name_len, "%s=%s", MESHLINK_MDNS_NAME_KEY, mesh->name); char txt_fingerprint[sizeof(MESHLINK_MDNS_FINGERPRINT_KEY) + 1 + MESHLINK_FINGERPRINTLEN + 1]; snprintf(txt_fingerprint, sizeof(txt_fingerprint), "%s=%s", MESHLINK_MDNS_FINGERPRINT_KEY, meshlink_get_fingerprint(mesh, (meshlink_node_t *)mesh->self)); - // Generate a name for the service (actually we do not care) - uuid_t srvname; - uuid_generate(srvname); - - char srvnamestr[36+1]; - uuid_unparse_lower(srvname, srvnamestr); - /* Add the service */ int ret = 0; - if((ret = avahi_server_add_service(mesh->avahi_server, mesh->avahi_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, srvnamestr, MESHLINK_MDNS_SERVICE_TYPE, NULL, NULL, atoi(mesh->myport), txt_name, txt_fingerprint, NULL)) < 0) + if((ret = avahi_server_add_service(mesh->avahi_server, mesh->avahi_group, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, 0, meshlink_get_fingerprint(mesh, (meshlink_node_t *)mesh->self), mesh->avahi_servicetype, NULL, NULL, atoi(mesh->myport), txt_name, txt_fingerprint, NULL)) < 0) { - fprintf(stderr, "Failed to add service: %s\n", avahi_strerror(ret)); + logger(mesh, MESHLINK_ERROR, "Failed to add service: %s\n", avahi_strerror(ret)); goto fail; } /* 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)); + logger(mesh, MESHLINK_ERROR, "Failed to commit entry_group: %s\n", avahi_strerror(ret)); goto fail; } @@ -116,7 +126,9 @@ fail: done: if(txt_name) - free(txt_name); + { free(txt_name); } + + pthread_mutex_unlock(&(mesh->mesh_mutex)); } static void discovery_server_callback(AvahiServer *server, AvahiServerState state, void * userdata) @@ -125,6 +137,8 @@ static void discovery_server_callback(AvahiServer *server, AvahiServerState stat // asserts assert(mesh != NULL); + + pthread_mutex_lock(&(mesh->mesh_mutex)); switch(state) { @@ -152,14 +166,13 @@ static void discovery_server_callback(AvahiServer *server, AvahiServerState stat char hostnamestr[36+1]; uuid_unparse_lower(hostname, hostnamestr); - fprintf(stderr, "Host name collision, retrying with '%s'\n", hostnamestr); + logger(mesh, MESHLINK_WARNING, "Avahi host name collision, retrying with '%s'\n", hostnamestr); int result = avahi_server_set_host_name(mesh->avahi_server, hostnamestr); if(result < 0) { - fprintf(stderr, "Failed to set new host name: %s\n", avahi_strerror(result)); + logger(mesh, MESHLINK_ERROR, "Avahi failed to set new host name: %s\n", avahi_strerror(result)); avahi_simple_poll_quit(mesh->avahi_poll); - return; } } break; @@ -184,7 +197,7 @@ static void discovery_server_callback(AvahiServer *server, AvahiServerState stat assert(mesh->avahi_poll != NULL); /* Terminate on failure */ - fprintf(stderr, "Server failure: %s\n", avahi_strerror(avahi_server_errno(mesh->avahi_server))); + logger(mesh, MESHLINK_ERROR, "Avahi server failure: %s\n", avahi_strerror(avahi_server_errno(mesh->avahi_server))); avahi_simple_poll_quit(mesh->avahi_poll); } break; @@ -192,6 +205,8 @@ static void discovery_server_callback(AvahiServer *server, AvahiServerState stat case AVAHI_SERVER_INVALID: break; } + + pthread_mutex_unlock(&(mesh->mesh_mutex)); } static void discovery_resolve_callback(AvahiSServiceResolver *resolver, AvahiIfIndex interface, 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, void* userdata) @@ -203,6 +218,8 @@ static void discovery_resolve_callback(AvahiSServiceResolver *resolver, AvahiIfI assert(mesh != NULL); assert(mesh->avahi_server != NULL); + pthread_mutex_lock(&(mesh->mesh_mutex)); + /* Called whenever a service has been resolved successfully or timed out */ switch(event) { @@ -213,7 +230,7 @@ static void discovery_resolve_callback(AvahiSServiceResolver *resolver, AvahiIfI assert(type != NULL); assert(domain != NULL); - 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))); + logger(mesh, MESHLINK_WARNING, "(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; @@ -229,11 +246,11 @@ static void discovery_resolve_callback(AvahiSServiceResolver *resolver, AvahiIfI char straddr[AVAHI_ADDRESS_STR_MAX], *strtxt; - fprintf(stderr, "(Resolver) Service '%s' of type '%s' in domain '%s':\n", name, type, domain); + logger(mesh, MESHLINK_DEBUG, "(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, + logger(mesh, MESHLINK_DEBUG, "\t%s:%u (%s)\n" "\tTXT=%s\n" "\tcookie is %u\n" @@ -256,64 +273,76 @@ static void discovery_resolve_callback(AvahiSServiceResolver *resolver, AvahiIfI if(node_name_li != NULL && node_fp_li != NULL) { - char *node_name = avahi_string_list_get_text(node_name_li) + strlen(MESHLINK_MDNS_NAME_KEY) + 1; - char *node_fp = avahi_string_list_get_text(node_fp_li) + strlen(MESHLINK_MDNS_FINGERPRINT_KEY) + 1; - - meshlink_node_t *node = meshlink_get_node(mesh, node_name); + char *node_name = (char*)avahi_string_list_get_text(node_name_li) + strlen(MESHLINK_MDNS_NAME_KEY); + char *node_fp = (char*)avahi_string_list_get_text(node_fp_li) + strlen(MESHLINK_MDNS_FINGERPRINT_KEY); - if(node != NULL) + if(node_name[0] == '=' && node_fp[0] == '=') { - fprintf(stderr, "Node %s is part of the mesh network.\n", node->name); + node_name += 1; + node_fp += 1; - sockaddr_t naddress; - memset(&naddress, 0, sizeof(naddress)); - - switch(address->proto) - { - case AVAHI_PROTO_INET: - { - naddress.in.sin_family = AF_INET; - naddress.in.sin_port = port; - naddress.in.sin_addr.s_addr = address->data.ipv4.address; - } - break; - - case AVAHI_PROTO_INET6: - { - naddress.in6.sin6_family = AF_INET6; - naddress.in6.sin6_port = 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; - } + meshlink_node_t *node = meshlink_get_node(mesh, node_name); - if(naddress.unknown.family != AF_UNKNOWN) + if(node != NULL) { - meshlink_hint_address(mesh, (meshlink_node_t *)node, (struct sockaddr*)&naddress); + 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 AVAHI_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 AVAHI_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) + { + meshlink_hint_address(mesh, (meshlink_node_t *)node, (struct sockaddr*)&naddress); + } + else + { + logger(mesh, MESHLINK_WARNING, "Could not resolve node %s to a known address family type.\n", node->name); + } } else { - fprintf(stderr, "Could not resolve node %s to a known address family type.\n", node->name); + logger(mesh, MESHLINK_WARNING, "Node %s is not part of the mesh network.\n", node_name); } } else { - fprintf(stderr, "Node %s is not part of the mesh network.\n", node_name); + logger(mesh, MESHLINK_WARNING, "TXT records invalid.\n"); } } else { - fprintf(stderr, "TXT records missing.\n"); + logger(mesh, MESHLINK_WARNING, "TXT records missing.\n"); } } break; } avahi_s_service_resolver_free(resolver); + + pthread_mutex_unlock(&(mesh->mesh_mutex)); } static void discovery_browse_callback(AvahiSServiceBrowser *browser, AvahiIfIndex interface, AvahiProtocol protocol, AvahiBrowserEvent event, const char *name, const char *type, const char *domain, AvahiLookupResultFlags flags, void* userdata) @@ -325,15 +354,17 @@ static void discovery_browse_callback(AvahiSServiceBrowser *browser, AvahiIfInde assert(mesh->avahi_server != NULL); assert(mesh->avahi_poll != NULL); + pthread_mutex_lock(&(mesh->mesh_mutex)); + /* 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))); + logger(mesh, MESHLINK_ERROR, "(Browser) %s\n", avahi_strerror(avahi_server_errno(mesh->avahi_server))); avahi_simple_poll_quit(mesh->avahi_poll); - return; } + break; case AVAHI_BROWSER_NEW: { @@ -342,14 +373,14 @@ static void discovery_browse_callback(AvahiSServiceBrowser *browser, AvahiIfInde assert(type != NULL); assert(domain != NULL); - fprintf(stderr, "(Browser) NEW: service '%s' of type '%s' in domain '%s'\n", name, type, domain); + logger(mesh, MESHLINK_DEBUG, "(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. Ifthe 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))); + logger(mesh, MESHLINK_DEBUG, "Failed to resolve service '%s': %s\n", name, avahi_strerror(avahi_server_errno(mesh->avahi_server))); } } break; @@ -361,17 +392,19 @@ static void discovery_browse_callback(AvahiSServiceBrowser *browser, AvahiIfInde assert(type != NULL); assert(domain != NULL); - fprintf(stderr, "(Browser) REMOVE: service '%s' of type '%s' in domain '%s'\n", name, type, domain); + logger(mesh, MESHLINK_DEBUG, "(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"); + logger(mesh, MESHLINK_DEBUG, "(Browser) %s\n", event == AVAHI_BROWSER_CACHE_EXHAUSTED ? "CACHE_EXHAUSTED" : "ALL_FOR_NOW"); } break; } + + pthread_mutex_unlock(&(mesh->mesh_mutex)); } static void *discovery_loop(void *userdata) @@ -387,19 +420,64 @@ static void *discovery_loop(void *userdata) return NULL; } +static void discovery_log_cb(AvahiLogLevel level, const char *txt) +{ + meshlink_log_level_t mlevel = MESHLINK_CRITICAL; + + switch(level) + { + case AVAHI_LOG_ERROR: + mlevel = MESHLINK_ERROR; + break; + + case AVAHI_LOG_WARN: + mlevel = MESHLINK_WARNING; + break; + + case AVAHI_LOG_NOTICE: + case AVAHI_LOG_INFO: + mlevel = MESHLINK_INFO; + break; + + case AVAHI_LOG_DEBUG: + mlevel = MESHLINK_DEBUG; + break; + } + + logger(NULL, mlevel, "%s\n", txt); +} + bool discovery_start(meshlink_handle_t *mesh) { + logger(mesh, MESHLINK_DEBUG, "discovery_start called\n"); + // asserts assert(mesh != NULL); assert(mesh->avahi_poll == NULL); assert(mesh->avahi_server == NULL); assert(mesh->avahi_browser == NULL); assert(mesh->discovery_threadstarted == false); + assert(mesh->avahi_servicetype == NULL); + + // handle avahi logs + avahi_set_log_function(discovery_log_cb); + + // create service type string + size_t servicetype_strlen = sizeof(MESHLINK_MDNS_SERVICE_TYPE) + strlen(mesh->appname) + 1; + mesh->avahi_servicetype = malloc(servicetype_strlen); + + if(mesh->avahi_servicetype == NULL) + { + logger(mesh, MESHLINK_ERROR, "Failed to allocate memory for service type string.\n"); + goto fail; + } + + snprintf(mesh->avahi_servicetype, servicetype_strlen, MESHLINK_MDNS_SERVICE_TYPE, mesh->appname); // Allocate discovery loop object if(!(mesh->avahi_poll = avahi_simple_poll_new())) { - fprintf(stderr, "Failed to create discovery poll object.\n"); + logger(mesh, MESHLINK_ERROR, "Failed to create discovery poll object.\n"); goto fail; } @@ -430,21 +508,21 @@ bool discovery_start(meshlink_handle_t *mesh) /* Check wether creating the server object succeeded */ if(!mesh->avahi_server) { - fprintf(stderr, "Failed to create discovery server: %s\n", avahi_strerror(error)); + logger(mesh, MESHLINK_ERROR, "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))) + if(!(mesh->avahi_browser = avahi_s_service_browser_new(mesh->avahi_server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, mesh->avahi_servicetype, NULL, 0, discovery_browse_callback, mesh))) { - fprintf(stderr, "Failed to create discovery service browser: %s\n", avahi_strerror(avahi_server_errno(mesh->avahi_server))); + logger(mesh, MESHLINK_ERROR, "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)); + logger(mesh, MESHLINK_ERROR, "Could not start discovery thread: %s\n", strerror(errno)); memset(&mesh->discovery_thread, 0, sizeof mesh->discovery_thread); goto fail; } @@ -454,49 +532,82 @@ bool discovery_start(meshlink_handle_t *mesh) return true; fail: - if(mesh->avahi_browser) + if(mesh->avahi_browser != NULL) { avahi_s_service_browser_free(mesh->avahi_browser); mesh->avahi_browser = NULL; } - if(mesh->avahi_server) + if(mesh->avahi_server != NULL) { avahi_server_free(mesh->avahi_server); mesh->avahi_server = NULL; } - if(mesh->avahi_poll) + if(mesh->avahi_poll != NULL) { avahi_simple_poll_free(mesh->avahi_poll); mesh->avahi_poll = NULL; } + if(mesh->avahi_servicetype != NULL) + { + free(mesh->avahi_servicetype); + mesh->avahi_servicetype = NULL; + } + return false; } void discovery_stop(meshlink_handle_t *mesh) { + logger(mesh, MESHLINK_DEBUG, "discovery_stop called\n"); + // asserts assert(mesh != NULL); - assert(mesh->avahi_poll != NULL); - assert(mesh->avahi_server != NULL); - assert(mesh->avahi_browser != NULL); - assert(mesh->discovery_threadstarted == true); - // Shut down - avahi_simple_poll_quit(mesh->avahi_poll); + // Shut down + if(mesh->avahi_poll) + { + avahi_simple_poll_quit(mesh->avahi_poll); + } // Wait for the discovery thread to finish - pthread_join(mesh->discovery_thread, NULL); + if(mesh->discovery_threadstarted == true) + { + pthread_join(mesh->discovery_thread, NULL); + mesh->discovery_threadstarted = false; + } // Clean up resources - avahi_s_service_browser_free(mesh->avahi_browser); - mesh->avahi_browser = NULL; + if(mesh->avahi_browser != NULL) + { + avahi_s_service_browser_free(mesh->avahi_browser); + mesh->avahi_browser = NULL; + } + + if(mesh->avahi_group) + { + avahi_s_entry_group_reset(mesh->avahi_group); + avahi_s_entry_group_free(mesh->avahi_group); + mesh->avahi_group = NULL; + } + + if(mesh->avahi_server != NULL) + { + avahi_server_free(mesh->avahi_server); + mesh->avahi_server = NULL; + } - avahi_server_free(mesh->avahi_server); - mesh->avahi_server = NULL; + if(mesh->avahi_poll != NULL) + { + avahi_simple_poll_free(mesh->avahi_poll); + mesh->avahi_poll = NULL; + } - avahi_simple_poll_free(mesh->avahi_poll); - mesh->avahi_poll = NULL; + if(mesh->avahi_servicetype != NULL) + { + free(mesh->avahi_servicetype); + mesh->avahi_servicetype = NULL; + } }