Allow meshlink_open() to be called with a NULL name.

[meshlink] / test / channels-cornercases.c

diff --git a/test/channels-cornercases.c b/test/channels-cornercases.c
index f2a01ba0b801aece4cafcee99b605f7e3c506d88..d4644a42c00943a1d9e57d91c4975f02fb192940 100644 (file)
--- a/test/channels-cornercases.c
+++ b/test/channels-cornercases.c
@@ -1,5 +1,9 @@
 #define _GNU_SOURCE
 
+#ifdef NDEBUG
+#undef NDEBUG
+#endif
+
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -15,24 +19,6 @@ static volatile bool b_responded = false;
 static volatile bool b_closed = false;
 static volatile size_t a_poll_cb_len;
 
-static 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);
-}
-
 static void a_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
        (void)mesh;
        (void)channel;
@@ -48,7 +34,7 @@ static void a_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, c
 static void b_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const void *data, size_t len) {
        // Send one message back, then close the channel.
        if(len) {
-               meshlink_channel_send(mesh, channel, data, len);
+               assert(meshlink_channel_send(mesh, channel, data, len) == (ssize_t)len);
        }
 
        meshlink_channel_close(mesh, channel);
@@ -111,10 +97,9 @@ int main() {
 
        struct sync_flag channel_opened = {.flag = false};
 
-       meshlink_channel_t *channel = meshlink_channel_open(a, nb, 7, a_receive_cb, NULL, 0);
+       meshlink_channel_t *channel = meshlink_channel_open(a, nb, 7, a_receive_cb, &channel_opened, 0);
        assert(channel);
 
-       channel->priv = &channel_opened;
        meshlink_set_channel_poll_cb(a, channel, poll_cb);
 
        // Start MeshLink and wait for the channel to become connected.
@@ -124,7 +109,7 @@ int main() {
 
        // Re-initialize everything
        meshlink_channel_close(a, channel);
-       close_meshlink_pair(a, b, "channels-cornercases");
+       close_meshlink_pair(a, b);
        b_responded = false;
        b_closed = false;
        channel_opened.flag = false;
@@ -139,9 +124,8 @@ int main() {
        nb = meshlink_get_node(a, "b");
        assert(nb);
 
-       channel = meshlink_channel_open(a, nb, 7, a_receive_cb, NULL, 0);
+       channel = meshlink_channel_open(a, nb, 7, a_receive_cb, &channel_opened, 0);
        assert(channel);
-       channel->priv = &channel_opened;
        meshlink_set_channel_poll_cb(a, channel, poll_cb);
 
        assert(wait_sync_flag(&channel_opened, 20));
@@ -154,8 +138,7 @@ int main() {
        struct sync_flag channel_closed = {.flag = false};
        channel->priv = &channel_closed;
 
-       meshlink_channel_send(a, channel, "Hello", 5);
-
+       assert(meshlink_channel_send(a, channel, "Hello", 5) == 5);
        assert(wait_sync_flag(&channel_closed, 20));
        assert(b_responded);
        assert(b_closed);
@@ -164,9 +147,8 @@ int main() {
 
        struct sync_flag channel_polled = {.flag = false};
 
-       meshlink_channel_t *channel2 = meshlink_channel_open(a, nb, 7, a_receive_cb, NULL, 0);
+       meshlink_channel_t *channel2 = meshlink_channel_open(a, nb, 7, a_receive_cb, &channel_polled, 0);
        assert(channel2);
-       channel2->priv = &channel_polled;
        meshlink_set_channel_poll_cb(a, channel2, poll_cb2);
 
        assert(wait_sync_flag(&channel_polled, 20));
@@ -175,7 +157,5 @@ int main() {
 
        meshlink_channel_close(a, channel);
        meshlink_channel_close(a, channel2);
-       close_meshlink_pair(a, b, "channels-cornercases");
-
-       return 0;
+       close_meshlink_pair(a, b);
 }