X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fchannels-cornercases.c;h=ca0d9b67b21b86993af2dcca4626adb6c3a3c64d;hb=e40d5bf3a0e030105334046319f377efbf3f06c4;hp=d7ef274ce9984c3c0496596222120b3e4e0d334b;hpb=05333b3a26842d1c10b5fe9211420c281b9a9ef4;p=meshlink

diff --git a/test/channels-cornercases.c b/test/channels-cornercases.c
index d7ef274c..ca0d9b67 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>
@@ -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,22 +34,12 @@ 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);
 }
 
-static bool reject_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t port, const void *data, size_t len) {
-	(void)mesh;
-	(void)channel;
-	(void)port;
-	(void)data;
-	(void)len;
-
-	return false;
-}
-
 static bool accept_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t port, const void *data, size_t len) {
 	(void)port;
 
@@ -93,7 +69,7 @@ static void poll_cb2(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_
 	set_sync_flag(channel->priv, true);
 }
 
-int main() {
+int main(void) {
 	meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
 
 	meshlink_handle_t *a, *b;
@@ -101,7 +77,6 @@ int main() {
 
 	// Set the callbacks.
 
-	meshlink_set_channel_accept_cb(a, reject_cb);
 	meshlink_set_channel_accept_cb(b, accept_cb);
 
 	// Open a channel from a to b before starting the mesh.
@@ -110,11 +85,11 @@ int main() {
 	assert(nb);
 
 	struct sync_flag channel_opened = {.flag = false};
+	init_sync_flag(&channel_opened);
 
-	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.
@@ -123,13 +98,13 @@ int main() {
 	assert(wait_sync_flag(&channel_opened, 20));
 
 	// Re-initialize everything
-	close_meshlink_pair(a, b, "channels-cornercases");
+	meshlink_channel_close(a, channel);
+	close_meshlink_pair(a, b);
 	b_responded = false;
 	b_closed = false;
 	channel_opened.flag = false;
 	open_meshlink_pair(&a, &b, "channels-cornercases");
 
-	meshlink_set_channel_accept_cb(a, reject_cb);
 	meshlink_set_channel_accept_cb(b, accept_cb);
 
 	start_meshlink_pair(a, b);
@@ -138,9 +113,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));
@@ -151,10 +125,10 @@ int main() {
 	// Send a message to b
 
 	struct sync_flag channel_closed = {.flag = false};
+	init_sync_flag(&channel_closed);
 	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);
@@ -162,15 +136,17 @@ int main() {
 	// Try to create a second channel
 
 	struct sync_flag channel_polled = {.flag = false};
+	init_sync_flag(&channel_polled);
 
-	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));
 
 	assert(0 == a_poll_cb_len);
 
-	return 0;
+	meshlink_channel_close(a, channel);
+	meshlink_channel_close(a, channel2);
+	close_meshlink_pair(a, b);
 }