Add meshlink_add_invitation_address(), deprecate meshlink_add_address().

[meshlink] / test / import-export.c

diff --git a/test/import-export.c b/test/import-export.c
index de2231e9298d2b673c4b808765e034c91b82a086..5d37146fd09502d8711f70a592033124462c8879 100644 (file)
--- a/test/import-export.c
+++ b/test/import-export.c
@@ -1,36 +1,40 @@
+#ifdef NDEBUG
+#undef NDEBUG
+#endif
+
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/time.h>
+#include <assert.h>
 
 #include "meshlink.h"
+#include "utils.h"
 
-volatile bool bar_reachable = false;
+struct sync_flag bar_reachable;
 
 void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
        (void)mesh;
 
-       if(!strcmp(node->name, "bar")) {
-               bar_reachable = reachable;
+       if(reachable && !strcmp(node->name, "bar")) {
+               set_sync_flag(&bar_reachable, true);
        }
 }
 
 int main() {
+       meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
+
        // Open two new meshlink instance.
 
-       meshlink_handle_t *mesh1 = meshlink_open("import_export_conf.1", "foo", "import-export", DEV_CLASS_BACKBONE);
+       assert(meshlink_destroy("import_export_conf.1"));
+       assert(meshlink_destroy("import_export_conf.2"));
 
-       if(!mesh1) {
-               fprintf(stderr, "Could not initialize configuration for foo\n");
-               return 1;
-       }
+       meshlink_handle_t *mesh1 = meshlink_open("import_export_conf.1", "foo", "import-export", DEV_CLASS_BACKBONE);
+       assert(mesh1);
 
        meshlink_handle_t *mesh2 = meshlink_open("import_export_conf.2", "bar", "import-export", DEV_CLASS_BACKBONE);
-
-       if(!mesh2) {
-               fprintf(stderr, "Could not initialize configuration for bar\n");
-               return 1;
-       }
+       assert(mesh2);
 
        // Disable local discovery
 
@@ -39,66 +43,49 @@ int main() {
 
        // Import and export both side's data
 
-       meshlink_add_address(mesh1, "localhost");
-       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);
 
-       if(!data) {
-               fprintf(stderr, "Foo could not export its configuration\n");
-               return 1;
-       }
-
-       if(!meshlink_import(mesh2, data)) {
-               fprintf(stderr, "Bar could not import foo's configuration\n");
-               return 1;
-       }
-
+       assert(meshlink_import(mesh2, data));
        free(data);
 
        data = meshlink_export(mesh2);
+       assert(data);
 
-       if(!data) {
-               fprintf(stderr, "Bar could not export its configuration\n");
-               return 1;
-       }
+       assert(meshlink_import(mesh1, data));
 
+       // Check that importing twice is fine
+       assert(meshlink_import(mesh1, data));
+       free(data);
 
-       if(!meshlink_import(mesh1, data)) {
-               fprintf(stderr, "Foo could not import bar's configuration\n");
-               return 1;
-       }
+       // Check that importing garbage is not fine
+       assert(!meshlink_import(mesh1, "Garbage\n"));
 
-       free(data);
+       // Check that foo knows bar, but that it is not reachable.
+
+       time_t last_reachable;
+       time_t last_unreachable;
+       meshlink_node_t *bar = meshlink_get_node(mesh1, "bar");
+       assert(bar);
+       assert(!meshlink_get_node_reachability(mesh1, bar, &last_reachable, &last_unreachable));
+       assert(!last_reachable);
+       assert(!last_unreachable);
 
        // Start both instances
 
        meshlink_set_node_status_cb(mesh1, status_cb);
 
-       if(!meshlink_start(mesh1)) {
-               fprintf(stderr, "Foo could not start\n");
-               return 1;
-       }
-
-       if(!meshlink_start(mesh2)) {
-               fprintf(stderr, "Bar could not start\n");
-               return 1;
-       }
+       assert(meshlink_start(mesh1));
+       assert(meshlink_start(mesh2));
 
        // Wait for the two to connect.
 
-       for(int i = 0; i < 20; i++) {
-               sleep(1);
+       assert(wait_sync_flag(&bar_reachable, 20));
 
-               if(bar_reachable) {
-                       break;
-               }
-       }
-
-       if(!bar_reachable) {
-               fprintf(stderr, "Bar not reachable for foo after 20 seconds\n");
-               return 1;
-       }
+       // Wait for UDP communication to become possible.
 
        int pmtu = meshlink_get_pmtu(mesh2, meshlink_get_node(mesh2, "bar"));
 
@@ -107,17 +94,28 @@ int main() {
                pmtu = meshlink_get_pmtu(mesh2, meshlink_get_node(mesh2, "bar"));
        }
 
-       if(!pmtu) {
-               fprintf(stderr, "UDP communication with bar not possible after 10 seconds\n");
-               return 1;
-       }
+       assert(pmtu);
 
-       // Clean up.
+       // 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.
 
-       meshlink_stop(mesh2);
        meshlink_stop(mesh1);
+       meshlink_stop(mesh2);
+
+       // Check that bar is no longer reachable
+
+       assert(!meshlink_get_node_reachability(mesh1, bar, &last_reachable, &last_unreachable));
+       assert(last_reachable);
+       assert(last_unreachable);
+       assert(last_reachable <= last_unreachable);
+
+       // Clean up.
+
        meshlink_close(mesh2);
        meshlink_close(mesh1);
-
-       return 0;
 }