X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Futils.c;h=4cafa4b452a9300b19d86c6fcace767ecefe2288;hb=5a8c20cfd63b480e94101f7333e871511a92fd37;hp=d7505ced77f4f8e8d513f591405e1fece2e12578;hpb=6bf3ea32f0afa91f1fed494542e873ca6abca9c9;p=meshlink

diff --git a/test/utils.c b/test/utils.c
index d7505ced..4cafa4b4 100644
--- a/test/utils.c
+++ b/test/utils.c
@@ -1,4 +1,4 @@
-#define _GNU_SOURCE
+#define _GNU_SOURCE 1
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,9 +8,9 @@
 
 #include "utils.h"
 
-void set_sync_flag(struct sync_flag *s) {
+void set_sync_flag(struct sync_flag *s, bool value) {
 	pthread_mutex_lock(&s->mutex);
-	s->flag = true;
+	s->flag = value;
 	pthread_cond_broadcast(&s->cond);
 	pthread_mutex_unlock(&s->mutex);
 }
@@ -20,9 +20,14 @@ bool wait_sync_flag(struct sync_flag *s, int seconds) {
 	clock_gettime(CLOCK_REALTIME, &timeout);
 	timeout.tv_sec += seconds;
 
+	pthread_mutex_lock(&s->mutex);
+
 	while(!s->flag)
-		if(!pthread_cond_timedwait(&s->cond, &s->mutex, &timeout) || errno != EINTR)
+		if(!pthread_cond_timedwait(&s->cond, &s->mutex, &timeout) || errno != EINTR) {
 			break;
+		}
+
+	pthread_mutex_unlock(&s->mutex);
 
 	return s->flag;
 }
@@ -33,11 +38,13 @@ void open_meshlink_pair(meshlink_handle_t **pa, meshlink_handle_t **pb, const ch
 	*pa = *pb = NULL;
 
 	char *a_name, *b_name;
+	int ret_val;
+	(void)ret_val;
 
-	asprintf(&a_name, "%s_conf.1", prefix);
+	ret_val = asprintf(&a_name, "%s_conf.1", prefix);
 	assert(a_name);
 
-	asprintf(&b_name, "%s_conf.2", prefix);
+	ret_val = asprintf(&b_name, "%s_conf.2", prefix);
 	assert(b_name);
 
 	meshlink_handle_t *a = meshlink_open(a_name, "a", prefix, DEV_CLASS_BACKBONE);
@@ -69,11 +76,13 @@ void open_meshlink_pair(meshlink_handle_t **pa, meshlink_handle_t **pb, const ch
 
 // Don't poll in the application thread, use a condition variable to signal when the peer is online.
 static void pair_status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
-	set_sync_flag(mesh->priv);
+	(void)node;
+
+	set_sync_flag(mesh->priv, reachable);
 }
 
 void start_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b) {
-	struct sync_flag pair_status = {};
+	struct sync_flag pair_status = {.flag = false};
 
 	a->priv = &pair_status;
 	meshlink_set_node_status_cb(a, pair_status_cb);
@@ -97,17 +106,19 @@ void stop_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b) {
 }
 
 void close_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b, const char *prefix) {
+	int ret_val;
+	(void)ret_val;
 	meshlink_close(a);
 	meshlink_close(b);
 
 	if(prefix) {
 		char *a_name, *b_name;
 
-		asprintf(&a_name, "%s_conf.1", prefix);
+		ret_val = asprintf(&a_name, "%s_conf.1", prefix);
 		assert(a_name);
 		assert(meshlink_destroy(a_name));
 
-		asprintf(&b_name, "%s_conf.2", prefix);
+		ret_val = asprintf(&b_name, "%s_conf.2", prefix);
 		assert(b_name);
 		assert(meshlink_destroy(b_name));
 	}