Never automatically try to bind to ports >= 32768.

[meshlink] / test / import-export.c

diff --git a/test/import-export.c b/test/import-export.c
index bffe0fc49cabfd9aae8b8022b723106c43122a63..15981ed9f673b032740ebbf9371482661ac4de41 100644 (file)
--- a/test/import-export.c
+++ b/test/import-export.c
@@ -12,9 +12,10 @@
 #include "meshlink.h"
 #include "utils.h"
 
-struct sync_flag bar_reachable;
+static struct sync_flag bar_reachable;
+static struct sync_flag pmtu_flag;
 
-void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
+static void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
        (void)mesh;
 
        if(reachable && !strcmp(node->name, "bar")) {
@@ -22,7 +23,18 @@ void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
        }
 }
 
-int main() {
+static void pmtu_cb(meshlink_handle_t *mesh, meshlink_node_t *node, uint16_t pmtu) {
+       (void)mesh;
+
+       if(pmtu && !strcmp(node->name, "bar")) {
+               set_sync_flag(&pmtu_flag, true);
+       }
+}
+
+int main(void) {
+       init_sync_flag(&bar_reachable);
+       init_sync_flag(&pmtu_flag);
+
        meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
 
        // Open two new meshlink instance.
@@ -43,8 +55,8 @@ int main() {
 
        // Import and export both side's data
 
-       assert(meshlink_add_address(mesh1, "localhost"));
-       assert(meshlink_add_address(mesh2, "localhost"));
+       assert(meshlink_set_canonical_address(mesh1, meshlink_get_self(mesh1), "localhost", NULL));
+       assert(meshlink_set_canonical_address(mesh2, meshlink_get_self(mesh2), "localhost", NULL));
 
        char *data = meshlink_export(mesh1);
        assert(data);
@@ -55,9 +67,15 @@ int main() {
        data = meshlink_export(mesh2);
        assert(data);
 
+       assert(meshlink_import(mesh1, data));
+
+       // Check that importing twice is fine
        assert(meshlink_import(mesh1, data));
        free(data);
 
+       // Check that importing garbage is not fine
+       assert(!meshlink_import(mesh1, "Garbage\n"));
+
        // Check that foo knows bar, but that it is not reachable.
 
        time_t last_reachable;
@@ -71,30 +89,23 @@ int main() {
        // Start both instances
 
        meshlink_set_node_status_cb(mesh1, status_cb);
+       meshlink_set_node_pmtu_cb(mesh1, pmtu_cb);
 
        assert(meshlink_start(mesh1));
        assert(meshlink_start(mesh2));
 
        // Wait for the two to connect.
 
-       assert(wait_sync_flag(&bar_reachable, 20));
+       assert(wait_sync_flag(&bar_reachable, 10));
 
        // Wait for UDP communication to become possible.
 
-       int pmtu = meshlink_get_pmtu(mesh2, meshlink_get_node(mesh2, "bar"));
-
-       for(int i = 0; i < 10 && !pmtu; i++) {
-               sleep(1);
-               pmtu = meshlink_get_pmtu(mesh2, meshlink_get_node(mesh2, "bar"));
-       }
-
-       assert(pmtu);
+       assert(wait_sync_flag(&pmtu_flag, 10));
 
        // Check that we now have reachability information
 
        assert(meshlink_get_node_reachability(mesh1, bar, &last_reachable, &last_unreachable));
        assert(last_reachable);
-       assert(!last_unreachable);
 
        // Stop the meshes.