Remove hack to wait for a valid key.

[meshlink] / test / channels.c

diff --git a/test/channels.c b/test/channels.c
index 1958ad761dbd79efc4c5ccefa941ec71555af7b0..10369ca67767f8f9faeeb87d002a36144a515c29 100644 (file)
--- a/test/channels.c
+++ b/test/channels.c
@@ -31,13 +31,17 @@ void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool 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");
+       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);
+       printf("bar_receive_cb %zu: ", len);
+       fwrite(data, 1, len, stdout);
+       printf("\n");
        // Echo the data back.
        meshlink_channel_send(mesh, channel, data, len);
 }
@@ -48,7 +52,10 @@ 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(data) {
+               fwrite(data, 1, len, stdout);
+       }
+       printf("\n");
 
        if(port != 7)
                return false;
@@ -81,6 +88,8 @@ int main(int argc, char *argv[]) {
                return 1;
        }
 
+       meshlink_enable_discovery(mesh1, false);
+       meshlink_enable_discovery(mesh2, false);
        meshlink_set_log_cb(mesh1, MESHLINK_DEBUG, log_cb);
        meshlink_set_log_cb(mesh2, MESHLINK_DEBUG, log_cb);
 
@@ -115,12 +124,12 @@ int main(int argc, char *argv[]) {
        free(data);
 
        // Set the callbacks.
-       
+
        meshlink_set_channel_accept_cb(mesh1, reject_cb);
        meshlink_set_channel_accept_cb(mesh2, accept_cb);
 
        meshlink_set_node_status_cb(mesh1, status_cb);
-       
+
        // Start both instances
 
        if(!meshlink_start(mesh1)) {
@@ -147,28 +156,17 @@ int main(int argc, char *argv[]) {
        }
 
        // Open a channel from foo to bar.
-       
+
        meshlink_node_t *bar = meshlink_get_node(mesh1, "bar");
        if(!bar) {
                fprintf(stderr, "Foo could not find bar\n");
                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);
 
-       for(int i = 0; i < 5; i++) {
+       for(int i = 0; i < 20; i++) {
                sleep(1);
                if(bar_responded)
                        break;