X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fimport-export.c;h=0671cf4770dddc68a29220a1e7088809e128694d;hb=cdb3dada645394bb1e0d0bf7816291fbd9a2a4a0;hp=8330f05f79fb77c066e9047026da6691030ebc58;hpb=668664d0ea90dc81670cccd7b7d56b36b8360eaa;p=meshlink

diff --git a/test/import-export.c b/test/import-export.c
index 8330f05f..0671cf47 100644
--- a/test/import-export.c
+++ b/test/import-export.c
@@ -2,24 +2,47 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/time.h>
 
 #include "meshlink.h"
 
 volatile bool bar_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;
+
 	if(!strcmp(node->name, "bar")) {
 		bar_reachable = reachable;
 	}
 }
 
-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("import_export_conf.1", "foo", "import-export", DEV_CLASS_BACKBONE);
 
 	if(!mesh1) {
-		fprintf(stderr, "Could not initialize configuration for foo\n");
+		fprintf(stderr, "Could not initialize configuration for foo: %s\n", meshlink_strerror(meshlink_errno));
 		return 1;
 	}
 
@@ -30,6 +53,9 @@ int main(int argc, char *argv[]) {
 		return 1;
 	}
 
+	meshlink_set_log_cb(mesh1, MESHLINK_DEBUG, log_cb);
+	meshlink_set_log_cb(mesh2, MESHLINK_DEBUG, log_cb);
+
 	// Disable local discovery
 
 	meshlink_enable_discovery(mesh1, false);
@@ -47,6 +73,8 @@ int main(int argc, char *argv[]) {
 		return 1;
 	}
 
+	fprintf(stderr, "Foo export data:\n%s\n", data);
+
 	if(!meshlink_import(mesh2, data)) {
 		fprintf(stderr, "Bar could not import foo's configuration\n");
 		return 1;