X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdiscovery.c;h=1f163cf682a41e596a8d7eb8a3a414538f4de0cb;hb=130b8c0b637619beaf65a9e00618c51f383451e8;hp=c004ce5849f839eb0bcde9d45e0d9cb26af792e8;hpb=ad85858f2a2383af2cf0bcdede7de11dcf60aa8f;p=meshlink diff --git a/src/discovery.c b/src/discovery.c index c004ce58..1f163cf6 100644 --- a/src/discovery.c +++ b/src/discovery.c @@ -67,6 +67,7 @@ static void discovery_create_services(meshlink_handle_t *mesh) assert(mesh->avahi_server != NULL); assert(mesh->avahi_poll != NULL); assert(mesh->avahi_servicetype != NULL); + assert(mesh->self != NULL); fprintf(stderr, "Adding service\n"); @@ -95,16 +96,9 @@ static void discovery_create_services(meshlink_handle_t *mesh) 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, mesh->avahi_servicetype, 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)); goto fail;