X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=test%2Finvite-join.c;h=c9ebea6043d2a39b05f02c9e163711eec028a61b;hp=eee5fa96b016e72e716b2652e19f88e27dd879ed;hb=fa05f996c5500c056a36c1d43e33a407f876643c;hpb=6086a7fc1ecdf197d3937cec5f291b83c5d68454

diff --git a/test/invite-join.c b/test/invite-join.c
index eee5fa96..c9ebea60 100644
--- a/test/invite-join.c
+++ b/test/invite-join.c
@@ -7,6 +7,24 @@
 
 volatile bool baz_reachable = false;
 
+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);
+}
+
 void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
 	(void)mesh;
 
@@ -16,7 +34,9 @@ void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
 }
 
 int main() {
-	// Open two new meshlink instance.
+	meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
+
+	// Open thee new meshlink instance.
 
 	meshlink_handle_t *mesh1 = meshlink_open("invite_join_conf.1", "foo", "invite-join", DEV_CLASS_BACKBONE);
 
@@ -25,6 +45,8 @@ int main() {
 		return 1;
 	}
 
+	meshlink_set_log_cb(mesh1, MESHLINK_DEBUG, log_cb);
+
 	meshlink_handle_t *mesh2 = meshlink_open("invite_join_conf.2", "bar", "invite-join", DEV_CLASS_BACKBONE);
 
 	if(!mesh2) {
@@ -32,6 +54,8 @@ int main() {
 		return 1;
 	}
 
+	meshlink_set_log_cb(mesh2, MESHLINK_DEBUG, log_cb);
+
 	meshlink_handle_t *mesh3 = meshlink_open("invite_join_conf.3", "quux", "invite-join", DEV_CLASS_BACKBONE);
 
 	if(!mesh3) {
@@ -39,6 +63,8 @@ int main() {
 		return 1;
 	}
 
+	meshlink_set_log_cb(mesh3, MESHLINK_DEBUG, log_cb);
+
 	// Disable local discovery.
 
 	meshlink_enable_discovery(mesh1, false);
@@ -69,6 +95,9 @@ int main() {
 		return 1;
 	}
 
+	fprintf(stderr, "Invitation URL for baz:  %s\n", baz_url);
+	fprintf(stderr, "Invitation URL for quux: %s\n", quux_url);
+
 	// Have the second instance join the first.
 
 	if(!meshlink_join(mesh2, baz_url)) {
@@ -123,8 +152,7 @@ int main() {
 
 	// Clean up.
 
-	meshlink_stop(mesh2);
-	meshlink_stop(mesh1);
+	meshlink_close(mesh3);
 	meshlink_close(mesh2);
 	meshlink_close(mesh1);