#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");
free(fingerprint);
free(txt_name);
free(txt_fingerprint);
-
- pthread_mutex_unlock(&(mesh->mesh_mutex));
}
static void discovery_server_callback(CattaServer *server, CattaServerState state, void *userdata) {
(void)server;
meshlink_handle_t *mesh = userdata;
- // asserts
- assert(mesh != NULL);
+ assert(mesh);
switch(state) {
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 */
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
if(!mesh->catta_group) {
discovery_create_services(mesh);
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
break;
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);
+ pthread_mutex_lock(&mesh->mutex);
+
+ assert(mesh->catta_server);
+ assert(mesh->catta_poll);
int result = catta_server_set_host_name(mesh->catta_server, hostname);
catta_simple_poll_quit(mesh->catta_poll);
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
}
break;
case CATTA_SERVER_REGISTERING:
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&mesh->mutex);
/* Let's drop our registered services. When the server is back
* in CATTA_SERVER_RUNNING state we will register them
mesh->catta_group = NULL;
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
break;
case CATTA_SERVER_FAILURE:
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&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);
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
break;
case CATTA_SERVER_INVALID:
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);
if(node_name[0] == '=' && node_fp[0] == '=') {
- pthread_mutex_lock(&(mesh->mesh_mutex));
+ pthread_mutex_lock(&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;
}
if(naddress.unknown.family != AF_UNKNOWN) {
- meshlink_hint_address(mesh, (meshlink_node_t *)node, (struct sockaddr *)&naddress);
-
node_t *n = (node_t *)node;
+ connection_t *c = n->connection;
+
+ node_add_recent_address(mesh, n, &naddress);
- if(n->connection && n->connection->outgoing) {
- n->connection->outgoing->timeout = 0;
+ if(c && c->outgoing && !c->status.active) {
+ c->outgoing->timeout = 0;
- if(n->connection->outgoing->ev.cb) {
- timeout_set(&mesh->loop, &n->connection->outgoing->ev, &(struct timeval) {
+ if(c->outgoing->ev.cb) {
+ timeout_set(&mesh->loop, &c->outgoing->ev, &(struct timespec) {
0, 0
});
}
- n->connection->last_ping_time = 0;
+ c->last_ping_time = 0;
}
} else {
logger(mesh, MESHLINK_WARNING, "Node %s is not part of the mesh network.\n", node_name);
}
- pthread_mutex_unlock(&(mesh->mesh_mutex));
+ pthread_mutex_unlock(&mesh->mutex);
}
}
/* Called whenever a new services becomes available on the LAN or is removed from the LAN */
switch(event) {
case CATTA_BROWSER_FAILURE:
- pthread_mutex_lock(&mesh->mesh_mutex);
+ pthread_mutex_lock(&mesh->mutex);
catta_simple_poll_quit(mesh->catta_poll);
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ pthread_mutex_unlock(&mesh->mutex);
break;
case CATTA_BROWSER_NEW:
- pthread_mutex_lock(&mesh->mesh_mutex);
+ pthread_mutex_lock(&mesh->mutex);
catta_s_service_resolver_new(mesh->catta_server, interface_, protocol, name, type, domain, CATTA_PROTO_UNSPEC, 0, discovery_resolve_callback, mesh);
handle_network_change(mesh, ++mesh->catta_interfaces);
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ pthread_mutex_unlock(&mesh->mutex);
break;
case CATTA_BROWSER_REMOVE:
- pthread_mutex_lock(&mesh->mesh_mutex);
+ pthread_mutex_lock(&mesh->mutex);
handle_network_change(mesh, --mesh->catta_interfaces);
- pthread_mutex_unlock(&mesh->mesh_mutex);
+ pthread_mutex_unlock(&mesh->mutex);
break;
case CATTA_BROWSER_ALL_FOR_NOW:
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);
// 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;
/* Free the configuration data */
catta_server_config_free(&config);
- /* Check wether creating the server object succeeded */
+ /* Check whether creating the server object succeeded */
if(!mesh->catta_server) {
logger(mesh, MESHLINK_ERROR, "Failed to create discovery server: %s\n", catta_strerror(error));
goto fail;
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) {
projects / meshlink / blobdiff