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

diff --git a/src/discovery.c b/src/discovery.c
index df88b179..d4790c43 100644
--- a/src/discovery.c
+++ b/src/discovery.c
@@ -343,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);
 
@@ -414,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);
 
@@ -461,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);