#define MESHLINK_MDNS_NAME_KEY "name"
#define MESHLINK_MDNS_FINGERPRINT_KEY "fingerprint"
-static void generate_rand_string(char *buffer, size_t size) {
+static void generate_rand_string(meshlink_handle_t *mesh, char *buffer, size_t size) {
+ assert(size);
+
for(size_t i = 0; i < (size - 1); ++i) {
- buffer[i] = 'a' + (rand() % ('z' - 'a' + 1));
+ buffer[i] = 'a' + prng(mesh, 'z' - 'a' + 1);
}
buffer[size - 1] = '\0';
(void)group;
meshlink_handle_t *mesh = userdata;
- // asserts
- assert(mesh != NULL);
- assert(mesh->catta_server != NULL);
- assert(mesh->catta_poll != NULL);
+ assert(mesh);
+ assert(mesh->catta_server);
+ assert(mesh->catta_poll);
/* Called whenever the entry group state changes */
switch(state) {
char *txt_name = NULL;
char *txt_fingerprint = NULL;
- // asserts
- assert(mesh != NULL);
- assert(mesh->name != NULL);
- assert(mesh->myport != NULL);
- assert(mesh->catta_server != NULL);
- assert(mesh->catta_poll != NULL);
- assert(mesh->catta_servicetype != NULL);
- assert(mesh->self != NULL);
+ assert(mesh);
+ assert(mesh->name);
+ assert(mesh->myport);
+ assert(mesh->catta_server);
+ assert(mesh->catta_poll);
+ assert(mesh->catta_servicetype);
+ assert(mesh->self);
logger(mesh, MESHLINK_DEBUG, "Adding service\n");
(void)server;
meshlink_handle_t *mesh = userdata;
- // asserts
- assert(mesh != NULL);
+ assert(mesh);
switch(state) {
case CATTA_SERVER_RUNNING:
case CATTA_SERVER_COLLISION: {
/* A host name collision happened. Let's pick a new name for the server */
char hostname[17];
- generate_rand_string(hostname, sizeof(hostname));
+ generate_rand_string(mesh, hostname, sizeof(hostname));
pthread_mutex_lock(&(mesh->mesh_mutex));
- //
- // asserts
- assert(mesh->catta_server != NULL);
- assert(mesh->catta_poll != NULL);
+
+ assert(mesh->catta_server);
+ assert(mesh->catta_poll);
int result = catta_server_set_host_name(mesh->catta_server, hostname);
case CATTA_SERVER_FAILURE:
pthread_mutex_lock(&(mesh->mesh_mutex));
- // asserts
- assert(mesh->catta_server != NULL);
- assert(mesh->catta_poll != NULL);
+ assert(mesh->catta_server);
+ assert(mesh->catta_poll);
/* Terminate on failure */
catta_simple_poll_quit(mesh->catta_poll);
meshlink_handle_t *mesh = userdata;
+ assert(mesh);
+
if(event != CATTA_RESOLVER_FOUND) {
catta_s_service_resolver_free(resolver);
return;
CattaStringList *node_name_li = catta_string_list_find(txt, MESHLINK_MDNS_NAME_KEY);
CattaStringList *node_fp_li = catta_string_list_find(txt, MESHLINK_MDNS_FINGERPRINT_KEY);
- if(node_name_li != NULL && node_fp_li != NULL) {
+ if(node_name_li && node_fp_li) {
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);
pthread_mutex_lock(&(mesh->mesh_mutex));
node_name += 1;
- node_fp += 1;
meshlink_node_t *node = meshlink_get_node(mesh, node_name);
- if(node != NULL) {
+ if(node) {
logger(mesh, MESHLINK_INFO, "Node %s is part of the mesh network.\n", node->name);
sockaddr_t naddress;
}
static void *discovery_loop(void *userdata) {
+ bool status = false;
meshlink_handle_t *mesh = userdata;
- assert(mesh != NULL);
+ assert(mesh);
// handle catta logs
catta_set_log_function(discovery_log_cb);
// create service type string
- size_t servicetype_strlen = sizeof(MESHLINK_MDNS_SERVICE_TYPE) + strlen(mesh->appname) + 1;
+ char appname[strlen(mesh->appname) + 2];
+ strcpy(appname, mesh->appname);
+
+ for(char *p = appname; *p; p++) {
+ if(!isalnum(*p) && *p != '_' && *p != '-') {
+ *p = '_';
+ }
+ }
+
+ if(!appname[1]) {
+ appname[1] = '_';
+ appname[2] = '\0';
+ }
+
+ size_t servicetype_strlen = sizeof(MESHLINK_MDNS_SERVICE_TYPE) + strlen(appname) + 1;
mesh->catta_servicetype = malloc(servicetype_strlen);
if(mesh->catta_servicetype == NULL) {
goto fail;
}
- snprintf(mesh->catta_servicetype, servicetype_strlen, MESHLINK_MDNS_SERVICE_TYPE, mesh->appname);
+ snprintf(mesh->catta_servicetype, servicetype_strlen, MESHLINK_MDNS_SERVICE_TYPE, appname);
// Allocate discovery loop object
if(!(mesh->catta_poll = catta_simple_poll_new())) {
// generate some unique host name (we actually do not care about it)
char hostname[17];
- generate_rand_string(hostname, sizeof(hostname));
+ generate_rand_string(mesh, hostname, sizeof(hostname));
// Let's set the host name for this server.
CattaServerConfig config;
goto fail;
}
+ status = true;
+
+fail:
+
pthread_mutex_lock(&mesh->discovery_mutex);
pthread_cond_broadcast(&mesh->discovery_cond);
pthread_mutex_unlock(&mesh->discovery_mutex);
- catta_simple_poll_loop(mesh->catta_poll);
-
-fail:
+ if(status) {
+ catta_simple_poll_loop(mesh->catta_poll);
+ }
- if(mesh->catta_browser != NULL) {
+ if(mesh->catta_browser) {
catta_s_service_browser_free(mesh->catta_browser);
mesh->catta_browser = NULL;
}
mesh->catta_group = NULL;
}
- if(mesh->catta_server != NULL) {
+ if(mesh->catta_server) {
catta_server_free(mesh->catta_server);
mesh->catta_server = NULL;
}
- if(mesh->catta_poll != NULL) {
+ if(mesh->catta_poll) {
catta_simple_poll_free(mesh->catta_poll);
mesh->catta_poll = NULL;
}
- if(mesh->catta_servicetype != NULL) {
+ if(mesh->catta_servicetype) {
free(mesh->catta_servicetype);
mesh->catta_servicetype = NULL;
}
bool discovery_start(meshlink_handle_t *mesh) {
logger(mesh, MESHLINK_DEBUG, "discovery_start called\n");
- // asserts
- assert(mesh != NULL);
- assert(mesh->catta_poll == NULL);
- assert(mesh->catta_server == NULL);
- assert(mesh->catta_browser == NULL);
- assert(mesh->discovery_threadstarted == false);
- assert(mesh->catta_servicetype == NULL);
+ assert(mesh);
+ assert(!mesh->catta_poll);
+ assert(!mesh->catta_server);
+ assert(!mesh->catta_browser);
+ assert(!mesh->discovery_threadstarted);
+ assert(!mesh->catta_servicetype);
// Start the discovery thread
if(pthread_create(&mesh->discovery_thread, NULL, discovery_loop, mesh) != 0) {
void discovery_stop(meshlink_handle_t *mesh) {
logger(mesh, MESHLINK_DEBUG, "discovery_stop called\n");
- // asserts
- assert(mesh != NULL);
+ assert(mesh);
// Shut down
if(mesh->catta_poll) {