assert(mesh->avahi_server != NULL);
assert(mesh->avahi_poll != NULL);
assert(mesh->avahi_servicetype != NULL);
+ assert(mesh->self != NULL);
fprintf(stderr, "Adding service\n");
/* 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)
+ {
+ fprintf(stderr, "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, 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;
done:
if(txt_name)
- free(txt_name);
+ { free(txt_name); }
}
static void discovery_server_callback(AvahiServer *server, AvahiServerState state, void * userdata)
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);
+ fprintf(stderr, "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 = 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;
+ }
+
+ if(naddress.unknown.family != AF_UNKNOWN)
+ {
+ meshlink_hint_address(mesh, (meshlink_node_t *)node, (struct sockaddr*)&naddress);
+ }
+ else
+ {
+ fprintf(stderr, "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);
+ fprintf(stderr, "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);
+ fprintf(stderr, "TXT records invalid.\n");
}
}
else
bool discovery_start(meshlink_handle_t *mesh)
{
+ fprintf(stderr, "discovery_start called\n");
+
// asserts
assert(mesh != NULL);
assert(mesh->avahi_poll == NULL);
void discovery_stop(meshlink_handle_t *mesh)
{
+ fprintf(stderr, "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);
- assert(mesh->avahi_servicetype != NULL);
- // 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;
+ }
- avahi_server_free(mesh->avahi_server);
- mesh->avahi_server = NULL;
+ if(mesh->avahi_server != NULL)
+ {
+ avahi_server_free(mesh->avahi_server);
+ mesh->avahi_server = NULL;
+ }
- avahi_simple_poll_free(mesh->avahi_poll);
- mesh->avahi_poll = NULL;
+ if(mesh->avahi_poll != NULL)
+ {
+ avahi_simple_poll_free(mesh->avahi_poll);
+ mesh->avahi_poll = NULL;
+ }
- free(mesh->avahi_servicetype);
- mesh->avahi_servicetype = NULL;
+ if(mesh->avahi_servicetype != NULL)
+ {
+ free(mesh->avahi_servicetype);
+ mesh->avahi_servicetype = NULL;
+ }
}
projects / meshlink / blobdiff