Speed up the import-export test by using the PMTU callback.

diff --git a/test/import-export.c b/test/import-export.c
index b18725872e13d05f30a20a982ca0afed006f5907..b3ac84108a6c951bd794ba2d9698ae7b13b93307 100644 (file)
--- a/test/import-export.c
+++ b/test/import-export.c
@@ -13,6 +13,7 @@
 #include "utils.h"
 
 static struct sync_flag bar_reachable;
 #include "utils.h"
 
 static struct sync_flag bar_reachable;

+static struct sync_flag pmtu_flag;

 
 static void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
        (void)mesh;
 
 static void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
        (void)mesh;


@@ -22,6 +23,14 @@ static void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reach
        }
 }
 
        }
 }
 

+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);
 
 int main(void) {
        init_sync_flag(&bar_reachable);
 


@@ -79,24 +88,18 @@ int main(void) {
        // Start both instances
 
        meshlink_set_node_status_cb(mesh1, status_cb);
        // 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(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.
 
 
        // 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
 
 
        // Check that we now have reachability information