X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fchannels-cornercases.c;h=d4644a42c00943a1d9e57d91c4975f02fb192940;hb=d9a6e9b7951388016638d05656645b22d8723fdb;hp=3e70686842fae824b5ef503f5a6d16331c8df836;hpb=9a2520c36431a8a5fd90451e97f488c22f4decc5;p=meshlink

diff --git a/test/channels-cornercases.c b/test/channels-cornercases.c
index 3e706868..d4644a42 100644
--- 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>
@@ -30,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);
@@ -93,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.
@@ -121,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));
@@ -136,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);
@@ -146,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));