X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fimport-export.c;h=eaa94497ba918f86d7ef84e15901df849287652d;hb=fa05f996c5500c056a36c1d43e33a407f876643c;hp=d6498c24b6647828a1fffb45f676623ee67eb2fc;hpb=6d1ac53f5c34ece4c7a82efb432a8e1d81fcff0d;p=meshlink

diff --git a/test/import-export.c b/test/import-export.c
index d6498c24..eaa94497 100644
--- a/test/import-export.c
+++ b/test/import-export.c
@@ -7,37 +7,73 @@
 
 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) {
-	if(!strcmp(node->name, "bar"))
+	(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");
+	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;
 	}
 
-	meshlink_handle_t *mesh2 = meshlink_open("import_export_conf.2", "bar");
+	meshlink_handle_t *mesh2 = meshlink_open("import_export_conf.2", "bar", "import-export", DEV_CLASS_BACKBONE);
+
 	if(!mesh2) {
 		fprintf(stderr, "Could not initialize configuration for bar\n");
 		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);
+	meshlink_enable_discovery(mesh2, false);
+
 	// 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;
 	}
 
+	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;
@@ -46,6 +82,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;
@@ -62,7 +99,7 @@ int main(int argc, char *argv[]) {
 	// Start both instances
 
 	meshlink_set_node_status_cb(mesh1, status_cb);
-	
+
 	if(!meshlink_start(mesh1)) {
 		fprintf(stderr, "Foo could not start\n");
 		return 1;
@@ -77,8 +114,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) {
@@ -87,6 +126,7 @@ int main(int argc, char *argv[]) {
 	}
 
 	int pmtu = meshlink_get_pmtu(mesh2, meshlink_get_node(mesh2, "bar"));
+
 	for(int i = 0; i < 10 && !pmtu; i++) {
 		sleep(1);
 		pmtu = meshlink_get_pmtu(mesh2, meshlink_get_node(mesh2, "bar"));