X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fchannels.c;h=c1befeec152cef52053e4c30c979336a6408ed80;hb=dd2cf09a9ac438b65a1f4c9dcff8d87a2b504538;hp=f572d1b110f19bf77a85abb8600c9496ffd06216;hpb=4c9d02d9b204f3300c28331b00baa32b2690a930;p=meshlink

diff --git a/test/channels.c b/test/channels.c
index f572d1b1..c1befeec 100644
--- a/test/channels.c
+++ b/test/channels.c
@@ -2,75 +2,135 @@
 #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) {
-	if(mesh)
+	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) {
-	if(!strcmp(node->name, "bar"))
+	(void)mesh;
+
+	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) {
-	if(len == 5 && !memcmp(data, "Hello", 5))
+	(void)mesh;
+	(void)channel;
+
+	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("\n");
 	// Echo the data back.
 	meshlink_channel_send(mesh, channel, data, len);
 }
 
 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;
 }
 
 bool accept_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, uint16_t port, const void *data, size_t len) {
-	if(port != 7)
+	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);
-	if(data)
+
+	if(data) {
 		bar_receive_cb(mesh, channel, data, len);
+	}
+
 	return true;
 }
 
 void poll_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, size_t len) {
+	(void)len;
+
 	meshlink_set_channel_poll_cb(mesh, channel, NULL);
-	if(meshlink_channel_send(mesh, channel, "Hello", 5) != 5)
+
+	if(meshlink_channel_send(mesh, channel, "Hello", 5) != 5) {
 		fprintf(stderr, "Could not send whole message\n");
+	}
 }
 
-int main(int argc, char *argv[]) {
+int main() {
 	meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
 
 	// Open two new meshlink instance.
 
 	meshlink_handle_t *mesh1 = meshlink_open("channels_conf.1", "foo", "channels", DEV_CLASS_BACKBONE);
+
 	if(!mesh1) {
 		fprintf(stderr, "Could not initialize configuration for foo\n");
 		return 1;
 	}
 
 	meshlink_handle_t *mesh2 = meshlink_open("channels_conf.2", "bar", "channels", DEV_CLASS_BACKBONE);
+
 	if(!mesh2) {
 		fprintf(stderr, "Could not initialize configuration for bar\n");
 		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);
+
 	// Import and export both side's data
 
 	meshlink_add_address(mesh1, "localhost");
-	meshlink_add_address(mesh2, "localhost");
 
 	char *data = meshlink_export(mesh1);
+
 	if(!data) {
 		fprintf(stderr, "Foo could not export its configuration\n");
 		return 1;
@@ -84,6 +144,7 @@ int main(int argc, char *argv[]) {
 	free(data);
 
 	data = meshlink_export(mesh2);
+
 	if(!data) {
 		fprintf(stderr, "Bar could not export its configuration\n");
 		return 1;
@@ -97,12 +158,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)) {
@@ -110,8 +171,6 @@ int main(int argc, char *argv[]) {
 		return 1;
 	}
 
-	usleep(123456);
-
 	if(!meshlink_start(mesh2)) {
 		fprintf(stderr, "Bar could not start\n");
 		return 1;
@@ -121,8 +180,10 @@ int main(int argc, char *argv[]) {
 
 	for(int i = 0; i < 20; i++) {
 		sleep(1);
-		if(bar_reachable)
+
+		if(bar_reachable) {
 			break;
+		}
 	}
 
 	if(!bar_reachable) {
@@ -130,11 +191,10 @@ 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");
+
 	if(!bar) {
 		fprintf(stderr, "Foo could not find bar\n");
 		return 1;
@@ -143,10 +203,12 @@ int main(int argc, char *argv[]) {
 	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)
+
+		if(bar_responded) {
 			break;
+		}
 	}
 
 	if(!bar_responded) {