Fix the basicpp test.

[meshlink] / test / channels.c

diff --git a/test/channels.c b/test/channels.c
index f572d1b110f19bf77a85abb8600c9496ffd06216..1958ad761dbd79efc4c5ccefa941ec71555af7b0 100644 (file)
--- a/test/channels.c
+++ b/test/channels.c
@@ -2,29 +2,42 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/time.h>
 
 #include "../src/meshlink.h"
+#include "../src/node.h"
 
 volatile bool bar_reachable = false;
 volatile bool bar_responded = false;
 
 void log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *text) {
+       static struct timeval tv0;
+       struct timeval tv;
+
+       if(tv0.tv_sec == 0)
+               gettimeofday(&tv0, NULL);
+       gettimeofday(&tv, NULL);
+       fprintf(stderr, "%u.%.03u ", (unsigned int)(tv.tv_sec-tv0.tv_sec), (unsigned int)tv.tv_usec/1000);
+
        if(mesh)
                fprintf(stderr, "(%s) ", mesh->name);
        fprintf(stderr, "[%d] %s\n", level, text);
 }
 
 void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
+       printf("status_cb: %s %sreachable\n", node->name, reachable?"":"un");
        if(!strcmp(node->name, "bar"))
                bar_reachable = reachable;
 }
 
 void foo_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
+       printf("foo_receive_cb %zu: ", len); fwrite(data, 1, len, stdout); printf("\n");
        if(len == 5 && !memcmp(data, "Hello", 5))
                bar_responded = true;
 }
 
 void bar_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
+       printf("bar_receive_cb %zu: ", len); fwrite(data, 1, len, stdout);
        // Echo the data back.
        meshlink_channel_send(mesh, channel, data, len);
 }
@@ -34,6 +47,9 @@ bool reject_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t po
 }
 
 bool accept_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t port, const void *data, size_t len) {
+       printf("accept_cb: (from %s on port %u) ", channel->node->name, (unsigned int)port);
+       if(data) { fwrite(data, 1, len, stdout); printf("\n"); }
+
        if(port != 7)
                return false;
        meshlink_set_channel_receive_cb(mesh, channel, bar_receive_cb);
@@ -65,10 +81,12 @@ int main(int argc, char *argv[]) {
                return 1;
        }
 
+       meshlink_set_log_cb(mesh1, MESHLINK_DEBUG, log_cb);
+       meshlink_set_log_cb(mesh2, MESHLINK_DEBUG, log_cb);
+
        // Import and export both side's data
 
        meshlink_add_address(mesh1, "localhost");
-       meshlink_add_address(mesh2, "localhost");
 
        char *data = meshlink_export(mesh1);
        if(!data) {
@@ -110,8 +128,6 @@ int main(int argc, char *argv[]) {
                return 1;
        }
 
-       usleep(123456);
-
        if(!meshlink_start(mesh2)) {
                fprintf(stderr, "Bar could not start\n");
                return 1;
@@ -130,8 +146,6 @@ int main(int argc, char *argv[]) {
                return 1;
        }
 
-       sleep(1);
-
        // Open a channel from foo to bar.
        
        meshlink_node_t *bar = meshlink_get_node(mesh1, "bar");
@@ -140,6 +154,17 @@ int main(int argc, char *argv[]) {
                return 1;
        }
 
+       // XXX not enough to wait for reachable, must wait for SPTPS to complete
+       for(int i=0; i < 20; i++) {
+               sleep(1);
+               if(((node_t *)bar)->status.validkey)
+                       break;
+       }
+       if(!((node_t *)bar)->status.validkey) {
+               fprintf(stderr, "No key exchange after 20 seconds\n");
+               return 1;
+       }
+
        meshlink_channel_t *channel = meshlink_channel_open(mesh1, bar, 7, foo_receive_cb, NULL, 0);
        meshlink_set_channel_poll_cb(mesh1, channel, poll_cb);