Never automatically try to bind to ports >= 32768.

[meshlink] / test / utils.c

diff --git a/test/utils.c b/test/utils.c
index f7dd3b3caff93aa037bbb3d5eaae53e43c1b1061..872060b1035a1076f5fb2205b76fdea12e4ebfa0 100644 (file)
--- a/test/utils.c
+++ b/test/utils.c
@@ -1,4 +1,8 @@
-#define _GNU_SOURCE 1
+#define _GNU_SOURCE
+
+#ifdef NDEBUG
+#undef NDEBUG
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -9,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;
 }
 
@@ -29,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) {
@@ -37,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;
 }
@@ -45,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
 
-       meshlink_add_address(a, "localhost");
-       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);
@@ -93,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);