X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fbasic.c;h=15bf7bf805ae0bade3cf59532aaeac77f9050710;hb=fa05f996c5500c056a36c1d43e33a407f876643c;hp=002c5769df4f43288d6a1df0acc9193729a20dde;hpb=01eaeb3c9fa60ae9c6e5b866acd9baef79622d99;p=meshlink

diff --git a/test/basic.c b/test/basic.c
index 002c5769..15bf7bf8 100644
--- a/test/basic.c
+++ b/test/basic.c
@@ -1,24 +1,51 @@
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
+#include <errno.h>
 
 #include "meshlink.h"
 
-int main(int argc, char *argv[]) {
+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);
+}
+
+int main() {
+	meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_cb);
+
 	// Open a new meshlink instance.
 
-	meshlink_handle_t *mesh = meshlink_open("basic_conf", "foo", "basic");
+	meshlink_handle_t *mesh = meshlink_open("basic_conf", "foo", "basic", DEV_CLASS_BACKBONE);
+
 	if(!mesh) {
 		fprintf(stderr, "Could not initialize configuration for foo\n");
 		return 1;
 	}
 
+	meshlink_set_log_cb(mesh, MESHLINK_DEBUG, log_cb);
+
 	// Check that our own node exists.
 
-	meshlink_node_t *self = meshlink_get_node(mesh, "foo");
+	meshlink_node_t *self = meshlink_get_self(mesh);
+
 	if(!self) {
 		fprintf(stderr, "Foo does not know about itself\n");
 		return 1;
 	}
+
 	if(strcmp(self->name, "foo")) {
 		fprintf(stderr, "Foo thinks its name is %s\n", self->name);
 		return 1;
@@ -30,6 +57,7 @@ int main(int argc, char *argv[]) {
 		fprintf(stderr, "Foo could not start\n");
 		return 1;
 	}
+
 	meshlink_stop(mesh);
 
 	// Make sure we can start and stop the mesh again.
@@ -38,6 +66,7 @@ int main(int argc, char *argv[]) {
 		fprintf(stderr, "Foo could not start twice\n");
 		return 1;
 	}
+
 	meshlink_stop(mesh);
 
 	// Close the mesh and open it again, now with a different name parameter.
@@ -46,22 +75,27 @@ int main(int argc, char *argv[]) {
 
 	// Check that the name is ignored now, and that we still are "foo".
 
-	mesh = meshlink_open("basic_conf", "bar", "basic");
+	mesh = meshlink_open("basic_conf", "bar", "basic", DEV_CLASS_BACKBONE);
+
 	if(!mesh) {
 		fprintf(stderr, "Could not open configuration for foo a second time\n");
 		return 1;
 	}
 
+	meshlink_set_log_cb(mesh, MESHLINK_DEBUG, log_cb);
+
 	if(meshlink_get_node(mesh, "bar")) {
 		fprintf(stderr, "Foo knows about bar, it shouldn't\n");
 		return 1;
 	}
 
-	self = meshlink_get_node(mesh, "foo");
+	self = meshlink_get_self(mesh);
+
 	if(!self) {
 		fprintf(stderr, "Foo doesn't know about itself the second time\n");
 		return 1;
 	}
+
 	if(strcmp(self->name, "foo")) {
 		fprintf(stderr, "Foo thinks its name is %s the second time\n", self->name);
 		return 1;
@@ -73,11 +107,24 @@ int main(int argc, char *argv[]) {
 		fprintf(stderr, "Foo could not start a third time\n");
 		return 1;
 	}
+
 	meshlink_stop(mesh);
 
 	// That's it.
 
 	meshlink_close(mesh);
 
+	// Destroy the mesh.
+
+	if(!meshlink_destroy("basic_conf")) {
+		fprintf(stderr, "Could not destroy configuration\n");
+		return 1;
+	}
+
+	if(!access("basic_conf", F_OK) || errno != ENOENT) {
+		fprintf(stderr, "Configuration not fully destroyed\n");
+		return 1;
+	}
+
 	return 0;
 }