#define MESHLINK_MDNS_NAME_KEY "name"
#define MESHLINK_MDNS_FINGERPRINT_KEY "fingerprint"
-static void generate_rand_string(char* buffer, size_t size) {
- for(size_t i = 0; i < (size - 1); ++i)
+static void generate_rand_string(char *buffer, size_t size) {
+ for(size_t i = 0; i < (size - 1); ++i) {
buffer[i] = 'a' + (rand() % ('z' - 'a' + 1));
+ }
- buffer[size-1] = '\0';
+ 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;
// asserts
/* 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, meshlink_get_fingerprint(mesh, (meshlink_node_t *)mesh->self), 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;
catta_simple_poll_quit(mesh->catta_poll);
done:
- if(txt_name)
+
+ if(txt_name) {
free(txt_name);
+ }
pthread_mutex_unlock(&(mesh->mesh_mutex));
}
-static void discovery_server_callback(CattaServer *server, CattaServerState state, void * userdata) {
+static void discovery_server_callback(CattaServer *server, CattaServerState state, void *userdata) {
+ (void)server;
meshlink_handle_t *mesh = userdata;
// asserts
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(!mesh->catta_group)
+ if(!mesh->catta_group) {
discovery_create_services(mesh);
+ }
}
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;
meshlink_handle_t *mesh = userdata;
// asserts
CattaStringList *node_fp_li = catta_string_list_find(txt, MESHLINK_MDNS_FINGERPRINT_KEY);
if(node_name_li != NULL && node_fp_li != NULL) {
- 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);
+ 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] == '=') {
node_name += 1;
break;
}
- if(naddress.unknown.family != AF_UNKNOWN)
- meshlink_hint_address(mesh, (meshlink_node_t *)node, (struct sockaddr*)&naddress);
- else
+ 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
+ }
+ } else {
logger(mesh, MESHLINK_WARNING, "Node %s is not part of the mesh network.\n", node_name);
- } else
+ }
+ } else {
logger(mesh, MESHLINK_WARNING, "TXT records invalid.\n");
- } else
+ }
+ } else {
logger(mesh, MESHLINK_WARNING, "TXT records missing.\n");
+ }
}
break;
}
pthread_mutex_unlock(&(mesh->mesh_mutex));
}
-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) {
+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;
// asserts
assert(domain != NULL);
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(!(catta_s_service_resolver_new(mesh->catta_server, interface_, protocol, name, type, domain, CATTA_PROTO_UNSPEC, 0, discovery_resolve_callback, mesh)))
+ if(!(catta_s_service_resolver_new(mesh->catta_server, interface_, protocol, name, type, domain, CATTA_PROTO_UNSPEC, 0, discovery_resolve_callback, mesh))) {
logger(mesh, MESHLINK_DEBUG, "Failed to resolve service '%s': %s\n", name, catta_strerror(catta_server_errno(mesh->catta_server)));
+ }
}
break;
break;
case CATTA_LOG_DEBUG:
+ default:
mlevel = MESHLINK_DEBUG;
break;
}
// Start the discovery thread
if(pthread_create(&mesh->discovery_thread, NULL, discovery_loop, mesh) != 0) {
logger(mesh, MESHLINK_ERROR, "Could not start discovery thread: %s\n", strerror(errno));
- memset(&mesh->discovery_thread, 0, sizeof mesh->discovery_thread);
+ memset(&mesh->discovery_thread, 0, sizeof(mesh)->discovery_thread);
goto fail;
}
return true;
fail:
+
if(mesh->catta_browser != NULL) {
catta_s_service_browser_free(mesh->catta_browser);
mesh->catta_browser = NULL;
assert(mesh != NULL);
// Shut down
- if(mesh->catta_poll)
+ if(mesh->catta_poll) {
catta_simple_poll_quit(mesh->catta_poll);
+ }
// Wait for the discovery thread to finish
if(mesh->discovery_threadstarted == true) {