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->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
if(!mesh->catta_group) {
discovery_create_services(mesh);
char hostname[17];
generate_rand_string(mesh, hostname, sizeof(hostname));
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
assert(mesh->catta_server);
assert(mesh->catta_poll);
break;
case CATTA_SERVER_REGISTERING:
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
/* Let's drop our registered services. When the server is back
* in CATTA_SERVER_RUNNING state we will register them
break;
case CATTA_SERVER_FAILURE:
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
assert(mesh->catta_server);
assert(mesh->catta_poll);
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->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
node_name += 1;
}
if(naddress.unknown.family != AF_UNKNOWN) {
- meshlink_hint_address(mesh, node, (struct sockaddr *)&naddress);
-
node_t *n = (node_t *)node;
connection_t *c = n->connection;
+ n->catta_address = naddress;
+ node_add_recent_address(mesh, n, &naddress);
+
if(c && c->outgoing && !c->status.active) {
c->outgoing->timeout = 0;
if(c->outgoing->ev.cb) {
- timeout_set(&mesh->loop, &c->outgoing->ev, &(struct timeval) {
+ timeout_set(&mesh->loop, &c->outgoing->ev, &(struct timespec) {
0, 0
});
}
- c->last_ping_time = 0;
+ c->last_ping_time = -3600;
}
} else {
/* 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->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
catta_simple_poll_quit(mesh->catta_poll);
pthread_mutex_unlock(&mesh->mutex);
break;
case CATTA_BROWSER_NEW:
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
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->mutex);
break;
case CATTA_BROWSER_REMOVE:
- pthread_mutex_lock(&mesh->mutex);
+ if(pthread_mutex_lock(&mesh->mutex) != 0) {
+ abort();
+ }
+
handle_network_change(mesh, --mesh->catta_interfaces);
pthread_mutex_unlock(&mesh->mutex);
break;
meshlink_handle_t *mesh = userdata;
assert(mesh);
+ if(pthread_mutex_lock(&mesh->discovery_mutex) != 0) {
+ abort();
+ }
+
// handle catta logs
catta_set_log_function(discovery_log_cb);
config.publish_hinfo = 0;
config.publish_addresses = 1;
config.publish_no_reverse = 1;
+ config.allow_point_to_point = 1;
/* Allocate a new server */
int error;
/* 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;
fail:
- pthread_mutex_lock(&mesh->discovery_mutex);
pthread_cond_broadcast(&mesh->discovery_cond);
pthread_mutex_unlock(&mesh->discovery_mutex);
assert(!mesh->discovery_threadstarted);
assert(!mesh->catta_servicetype);
+ if(pthread_mutex_lock(&mesh->discovery_mutex) != 0) {
+ abort();
+ }
+
// Start the discovery thread
if(pthread_create(&mesh->discovery_thread, NULL, discovery_loop, mesh) != 0) {
+ pthread_mutex_unlock(&mesh->discovery_mutex);
logger(mesh, MESHLINK_ERROR, "Could not start discovery thread: %s\n", strerror(errno));
memset(&mesh->discovery_thread, 0, sizeof(mesh)->discovery_thread);
return false;
}
- pthread_mutex_lock(&mesh->discovery_mutex);
pthread_cond_wait(&mesh->discovery_cond, &mesh->discovery_mutex);
pthread_mutex_unlock(&mesh->discovery_mutex);
// Wait for the discovery thread to finish
if(mesh->discovery_threadstarted == true) {
- pthread_join(mesh->discovery_thread, NULL);
+ if(pthread_join(mesh->discovery_thread, NULL) != 0) {
+ abort();
+ }
+
mesh->discovery_threadstarted = false;
}