Don't use assert() to check the results of pthread_*() calls.

[meshlink] / src / discovery.c

diff --git a/src/discovery.c b/src/discovery.c
index db71a5d15a47034d100745eda2a395c8b8310721..e144c286cbafcefac637b2bbeff50b5e3fa06be7 100644 (file)
--- a/src/discovery.c
+++ b/src/discovery.c
@@ -124,9 +124,12 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat
 
        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);
@@ -141,7 +144,9 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat
                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);
@@ -157,7 +162,9 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat
        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
@@ -172,7 +179,9 @@ static void discovery_server_callback(CattaServer *server, CattaServerState stat
                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);
@@ -215,7 +224,9 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI
                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;
 
@@ -263,7 +274,7 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI
                                                        });
                                                }
 
-                                               c->last_ping_time = 0;
+                                               c->last_ping_time = -3600;
                                        }
 
                                } else {
@@ -288,20 +299,29 @@ static void discovery_browse_callback(CattaSServiceBrowser *browser, CattaIfInde
        /* 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;
@@ -343,6 +363,10 @@ static void *discovery_loop(void *userdata) {
        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);
 
@@ -390,6 +414,7 @@ static void *discovery_loop(void *userdata) {
        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;
@@ -414,7 +439,6 @@ static void *discovery_loop(void *userdata) {
 
 fail:
 
-       pthread_mutex_lock(&mesh->discovery_mutex);
        pthread_cond_broadcast(&mesh->discovery_cond);
        pthread_mutex_unlock(&mesh->discovery_mutex);
 
@@ -461,14 +485,18 @@ bool discovery_start(meshlink_handle_t *mesh) {
        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);
 
@@ -489,7 +517,10 @@ void discovery_stop(meshlink_handle_t *mesh) {
 
        // 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;
        }