X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fchannels.c;h=cf1ff891fa791dcc1051fd47593ba865ae60fd4b;hb=157c8660a94aea6eddef4dd290ae93d40566b2d8;hp=99a97a33fd571cda3c6ecf826beecdff6112bc1f;hpb=5dec7459d9920c930bdfb3ac0f2a3740a6247ec0;p=meshlink

diff --git a/test/channels.c b/test/channels.c
index 99a97a33..cf1ff891 100644
--- a/test/channels.c
+++ b/test/channels.c
@@ -17,7 +17,7 @@ void log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *tex
 	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)
 		fprintf(stderr, "(%s) ", mesh->name);
@@ -25,7 +25,7 @@ void log_cb(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *tex
 }
 
 void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
-	printf("status_cb: %s %sreachable\n", node->name, reachable?"":"un");
+	printf("status_cb: %s %sreachable\n", node->name, reachable ? "" : "un");
 	if(!strcmp(node->name, "bar"))
 		bar_reachable = reachable;
 }
@@ -41,6 +41,7 @@ void foo_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, const
 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);
 }
@@ -51,10 +52,9 @@ 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) {
+	if(data)
 		fwrite(data, 1, len, stdout);
-		printf("\n");
-	}
+	printf("\n");
 
 	if(port != 7)
 		return false;
@@ -162,21 +162,10 @@ int main(int argc, char *argv[]) {
 		return 1;
 	}
 
-	// XXX not enough to wait for reachable, must wait for SPTPS to complete
-	for(int i=0; i < 20; i++) {
-		sleep(1);
-		if(((node_t *)bar)->status.validkey)
-			break;
-	}
-	if(!((node_t *)bar)->status.validkey) {
-		fprintf(stderr, "No key exchange after 20 seconds\n");
-		return 1;
-	}
-
 	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)
 			break;