Properly initialize mutexes and condition variables.

[meshlink] / src / discovery.c

diff --git a/src/discovery.c b/src/discovery.c
index a64e9e2ebcf5434785c4a183c59be8c180dee6e7..d4790c43f8292020d352606fa23e2cfef78566a5 100644 (file)
--- a/src/discovery.c
+++ b/src/discovery.c
@@ -248,20 +248,22 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI
                                }
 
                                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;
+
+                                       n->catta_address = naddress;
+                                       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 = -3600;
                                        }
 
                                } else {
@@ -341,6 +343,8 @@ static void *discovery_loop(void *userdata) {
        meshlink_handle_t *mesh = userdata;
        assert(mesh);
 
+       pthread_mutex_lock(&mesh->discovery_mutex);
+
        // handle catta logs
        catta_set_log_function(discovery_log_cb);
 
@@ -396,7 +400,7 @@ static void *discovery_loop(void *userdata) {
        /* 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;
@@ -412,7 +416,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);
 
@@ -459,14 +462,16 @@ bool discovery_start(meshlink_handle_t *mesh) {
        assert(!mesh->discovery_threadstarted);
        assert(!mesh->catta_servicetype);
 
+       pthread_mutex_lock(&mesh->discovery_mutex);
+
        // 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);