X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fget-all-nodes.c;h=152184c67a7a4092a03bfdf57481c7cb575f80f4;hb=refs%2Fheads%2Fdebug%2Fadns;hp=5dc4af1ea15c15262ba28763dd2df55f13b71a83;hpb=42cef01039177f3c762001439c8fb6bbdcd6e159;p=meshlink

diff --git a/test/get-all-nodes.c b/test/get-all-nodes.c
index 5dc4af1e..152184c6 100644
--- a/test/get-all-nodes.c
+++ b/test/get-all-nodes.c
@@ -13,9 +13,9 @@
 #include "meshlink.h"
 #include "utils.h"
 
-struct sync_flag bar_reachable;
+static struct sync_flag bar_reachable;
 
-void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
+static void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
 	(void)mesh;
 
 	if(reachable && !strcmp(node->name, "bar")) {
@@ -23,7 +23,9 @@ void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
 	}
 }
 
-int main() {
+int main(void) {
+	init_sync_flag(&bar_reachable);
+
 	struct meshlink_node **nodes = NULL;
 	size_t nnodes = 0;
 
@@ -36,10 +38,10 @@ int main() {
 	assert(meshlink_destroy("get_all_nodes_conf.3"));
 
 	meshlink_handle_t *mesh[3];
-	mesh[0] = meshlink_open("get_all_nodes_conf.1", "foo", "import-export", DEV_CLASS_BACKBONE);
+	mesh[0] = meshlink_open("get_all_nodes_conf.1", "foo", "get-all-nodes", DEV_CLASS_BACKBONE);
 	assert(mesh[0]);
 
-	mesh[1] = meshlink_open("get_all_nodes_conf.2", "bar", "import-export", DEV_CLASS_STATIONARY);
+	mesh[1] = meshlink_open("get_all_nodes_conf.2", "bar", "get-all-nodes", DEV_CLASS_STATIONARY);
 	assert(mesh[1]);
 
 	mesh[2] = meshlink_open("get_all_nodes_conf.3", "baz", "get-all-nodes", DEV_CLASS_STATIONARY);
@@ -64,7 +66,7 @@ int main() {
 
 	for(int i = 0; i < 3; i++) {
 		meshlink_enable_discovery(mesh[i], false);
-		assert(meshlink_add_address(mesh[i], "localhost"));
+		assert(meshlink_set_canonical_address(mesh[i], meshlink_get_self(mesh[i]), "localhost", NULL));
 		char *data = meshlink_export(mesh[i]);
 		assert(data);
 
@@ -169,7 +171,7 @@ int main() {
 	meshlink_close(mesh[0]);
 	sleep(2);
 	time_t foo_stopped = time(NULL);
-	mesh[0] = meshlink_open("get_all_nodes_conf.1", "foo", "import-export", DEV_CLASS_BACKBONE);
+	mesh[0] = meshlink_open("get_all_nodes_conf.1", "foo", "get-all_nodes", DEV_CLASS_BACKBONE);
 	assert(mesh[0]);
 
 	nodes = meshlink_get_all_nodes(mesh[0], nodes, &nnodes);