X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Futils.c;h=21d3b149fa06bee7a98d8f02e16be637b4d9fa93;hb=46079ef8d3adcb693d593cfd362879eb8e4709df;hp=862e033ec0f0ac1ad83bdedfc70345ffbe939b99;hpb=dc0e52cb3e42620c3139e713b373d130aa30b698;p=meshlink

diff --git a/test/utils.c b/test/utils.c
index 862e033e..21d3b149 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>
@@ -15,30 +15,62 @@ void set_sync_flag(struct sync_flag *s, bool value) {
 	pthread_mutex_unlock(&s->mutex);
 }
 
+bool check_sync_flag(struct sync_flag *s) {
+	bool flag;
+	pthread_mutex_lock(&s->mutex);
+	flag = s->flag;
+	pthread_mutex_unlock(&s->mutex);
+	return flag;
+}
+
 bool wait_sync_flag(struct sync_flag *s, int seconds) {
 	struct timespec timeout;
 	clock_gettime(CLOCK_REALTIME, &timeout);
 	timeout.tv_sec += seconds;
 
-	while(!s->flag)
+	pthread_mutex_lock(&s->mutex);
+
+	while(!s->flag) {
 		if(!pthread_cond_timedwait(&s->cond, &s->mutex, &timeout) || errno != EINTR) {
 			break;
 		}
+	}
+
+	pthread_mutex_unlock(&s->mutex);
 
 	return s->flag;
 }
 
+void link_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b) {
+	// Import and export both side's data
+
+	meshlink_add_address(a, "localhost");
+	meshlink_add_address(b, "localhost");
+
+	char *data = meshlink_export(a);
+	assert(data);
+	assert(meshlink_import(b, data));
+	free(data);
+
+	data = meshlink_export(b);
+	assert(data);
+	assert(meshlink_import(a, data));
+	free(data);
+}
+
 void open_meshlink_pair(meshlink_handle_t **pa, meshlink_handle_t **pb, const char *prefix) {
 	// Create two new MeshLink instances
 
 	*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);
@@ -50,19 +82,7 @@ void open_meshlink_pair(meshlink_handle_t **pa, meshlink_handle_t **pb, const ch
 	meshlink_enable_discovery(a, false);
 	meshlink_enable_discovery(b, false);
 
-	// Import and export both side's data
-
-	meshlink_add_address(a, "localhost");
-
-	char *data = meshlink_export(a);
-	assert(data);
-	assert(meshlink_import(b, data));
-	free(data);
-
-	data = meshlink_export(b);
-	assert(data);
-	assert(meshlink_import(a, data));
-	free(data);
+	link_meshlink_pair(a, b);
 
 	*pa = a;
 	*pb = b;
@@ -81,15 +101,11 @@ void start_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b) {
 	a->priv = &pair_status;
 	meshlink_set_node_status_cb(a, pair_status_cb);
 
-	pthread_mutex_lock(&pair_status.mutex);
-
 	meshlink_start(a);
 	meshlink_start(b);
 
 	assert(wait_sync_flag(&pair_status, 5));
 
-	pthread_mutex_unlock(&pair_status.mutex);
-
 	meshlink_set_node_status_cb(a, NULL);
 	a->priv = NULL;
 }
@@ -100,17 +116,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));
 	}