X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=inline;f=test%2Fchannels.c;h=68512eecdf3a4069ec50919354836b12133bc2b0;hb=516bfe0557afe6adaa3ea73494b5fe1cf5587b64;hp=10369ca67767f8f9faeeb87d002a36144a515c29;hpb=3c56342ef05b0f81bcd9feba5d86e2bff8a0cb94;p=meshlink

diff --git a/test/channels.c b/test/channels.c
index 10369ca6..68512eec 100644
--- a/test/channels.c
+++ b/test/channels.c
@@ -14,28 +14,36 @@ void log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *tex
 	static struct timeval tv0;
 	struct timeval tv;
 
-	if(tv0.tv_sec == 0)
+	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);
+	fprintf(stderr, "%u.%.03u ", (unsigned int)(tv.tv_sec - tv0.tv_sec), (unsigned int)tv.tv_usec / 1000);
 
-	if(mesh)
+	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) {
-	printf("status_cb: %s %sreachable\n", node->name, reachable?"":"un");
-	if(!strcmp(node->name, "bar"))
+	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) {
 	printf("foo_receive_cb %zu: ", len);
 	fwrite(data, 1, len, stdout);
 	printf("\n");
-	if(len == 5 && !memcmp(data, "Hello", 5))
+
+	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) {
@@ -52,23 +60,32 @@ 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(port != 7)
+	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) {
 	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[]) {
@@ -77,12 +94,14 @@ int main(int argc, char *argv[]) {
 	// 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;
@@ -98,6 +117,7 @@ int main(int argc, char *argv[]) {
 	meshlink_add_address(mesh1, "localhost");
 
 	char *data = meshlink_export(mesh1);
+
 	if(!data) {
 		fprintf(stderr, "Foo could not export its configuration\n");
 		return 1;
@@ -111,6 +131,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;
@@ -146,8 +167,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) {
@@ -158,6 +181,7 @@ 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;
@@ -168,8 +192,10 @@ int main(int argc, char *argv[]) {
 
 	for(int i = 0; i < 20; i++) {
 		sleep(1);
-		if(bar_responded)
+
+		if(bar_responded) {
 			break;
+		}
 	}
 
 	if(!bar_responded) {