X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Futils.c;h=53f83d30fb44a6ac21bea13a904ebd0039e3a0f0;hb=HEAD;hp=28e3d62fd90e133a23dfc3440dbc1f3905c9e68b;hpb=fe5563f92021618b4a8b41e412c73d8364fcaf6e;p=meshlink

diff --git a/test/utils.c b/test/utils.c
index 28e3d62f..872060b1 100644
--- a/test/utils.c
+++ b/test/utils.c
@@ -1,4 +1,4 @@
-#define _GNU_SOURCE 1
+#define _GNU_SOURCE
 
 #ifdef NDEBUG
 #undef NDEBUG
@@ -13,18 +13,30 @@
 
 #include "utils.h"
 
+void init_sync_flag(struct sync_flag *s) {
+	assert(pthread_mutex_init(&s->mutex, NULL) == 0);
+	assert(pthread_cond_init(&s->cond, NULL) == 0);
+	s->flag = false;
+}
+
 void set_sync_flag(struct sync_flag *s, bool value) {
-	pthread_mutex_lock(&s->mutex);
+	assert(pthread_mutex_lock(&s->mutex) == 0);
 	s->flag = value;
-	pthread_cond_broadcast(&s->cond);
-	pthread_mutex_unlock(&s->mutex);
+	assert(pthread_cond_broadcast(&s->cond) == 0);
+	assert(pthread_mutex_unlock(&s->mutex) == 0);
+}
+
+void reset_sync_flag(struct sync_flag *s) {
+	assert(pthread_mutex_lock(&s->mutex) == 0);
+	s->flag = false;
+	assert(pthread_mutex_unlock(&s->mutex) == 0);
 }
 
 bool check_sync_flag(struct sync_flag *s) {
 	bool flag;
-	pthread_mutex_lock(&s->mutex);
+	assert(pthread_mutex_lock(&s->mutex) == 0);
 	flag = s->flag;
-	pthread_mutex_unlock(&s->mutex);
+	assert(pthread_mutex_unlock(&s->mutex) == 0);
 	return flag;
 }
 
@@ -33,7 +45,7 @@ bool wait_sync_flag(struct sync_flag *s, int seconds) {
 	clock_gettime(CLOCK_REALTIME, &timeout);
 	timeout.tv_sec += seconds;
 
-	pthread_mutex_lock(&s->mutex);
+	assert(pthread_mutex_lock(&s->mutex) == 0);
 
 	while(!s->flag) {
 		if(!pthread_cond_timedwait(&s->cond, &s->mutex, &timeout) || errno != EINTR) {
@@ -41,7 +53,7 @@ bool wait_sync_flag(struct sync_flag *s, int seconds) {
 		}
 	}
 
-	pthread_mutex_unlock(&s->mutex);
+	assert(pthread_mutex_unlock(&s->mutex) == 0);
 
 	return s->flag;
 }
@@ -49,8 +61,8 @@ bool wait_sync_flag(struct sync_flag *s, int seconds) {
 void link_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b) {
 	// Import and export both side's data
 
-	assert(meshlink_add_address(a, "localhost"));
-	assert(meshlink_add_address(b, "localhost"));
+	assert(meshlink_set_canonical_address(a, meshlink_get_self(a), "localhost", NULL));
+	assert(meshlink_set_canonical_address(b, meshlink_get_self(b), "localhost", NULL));
 
 	char *data = meshlink_export(a);
 	assert(data);
@@ -97,17 +109,38 @@ void open_meshlink_pair(meshlink_handle_t **pa, meshlink_handle_t **pb, const ch
 	*pb = b;
 }
 
+void open_meshlink_pair_ephemeral(meshlink_handle_t **pa, meshlink_handle_t **pb, const char *prefix) {
+	// Create two new MeshLink instances
+
+	*pa = *pb = NULL;
+
+	meshlink_handle_t *a = meshlink_open_ephemeral("a", prefix, DEV_CLASS_BACKBONE);
+	meshlink_handle_t *b = meshlink_open_ephemeral("b", prefix, DEV_CLASS_BACKBONE);
+
+	assert(a);
+	assert(b);
+
+	meshlink_enable_discovery(a, false);
+	meshlink_enable_discovery(b, false);
+
+	link_meshlink_pair(a, b);
+
+	*pa = a;
+	*pb = b;
+}
+
 // 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) {
 	(void)node;
 
-	if(reachable) {
+	if(reachable && meshlink_get_self(mesh) != node) {
 		set_sync_flag(mesh->priv, true);
 	}
 }
 
 void start_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b) {
 	struct sync_flag pair_status = {.flag = false};
+	init_sync_flag(&pair_status);
 
 	a->priv = &pair_status;
 	meshlink_set_node_status_cb(a, pair_status_cb);