X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdiscovery.c;h=d4790c43f8292020d352606fa23e2cfef78566a5;hb=8e4f6238558c28cd05bd580cc947d7178d2bac90;hp=52b08f2c8b008e768b94674ade053d59b075f439;hpb=3a9f2423b3be9423619f74ff5ea277fcb6e28660;p=meshlink

diff --git a/src/discovery.c b/src/discovery.c
index 52b08f2c..d4790c43 100644
--- a/src/discovery.c
+++ b/src/discovery.c
@@ -248,21 +248,22 @@ static void discovery_resolve_callback(CattaSServiceResolver *resolver, CattaIfI
 				}
 
 				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 {
@@ -342,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);
 
@@ -397,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;
@@ -413,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);
 
@@ -460,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);