X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Fget-all-nodes.c;h=1945058fb72a4340e3a1928c7ab6c9fc791c0ec6;hb=92bae04187d9ecd7900b5a28154a2c046001a7f3;hp=33adb9a39efd1943daeaa00ec93a156036b7fb29;hpb=9d23fe58052b3ef971305699a00ea6dbd1111744;p=meshlink-tiny

diff --git a/test/get-all-nodes.c b/test/get-all-nodes.c
index 33adb9a..1945058 100644
--- a/test/get-all-nodes.c
+++ b/test/get-all-nodes.c
@@ -10,7 +10,7 @@
 #include <time.h>
 #include <assert.h>
 
-#include "meshlink.h"
+#include "meshlink-tiny.h"
 #include "utils.h"
 
 static struct sync_flag bar_reachable;
@@ -53,19 +53,9 @@ int main(void) {
 	assert(nnodes == 1);
 	assert(nodes[0] == meshlink_get_self(mesh[0]));
 
-	// We should never have been online.
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], 0, -1, nodes, &nnodes);
-	assert(nnodes == 0);
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], 0, 0, nodes, &nnodes);
-	assert(nnodes == 1);
-	assert(nodes[0] == meshlink_get_self(mesh[0]));
-
 	// Let nodes know about each other.
 
 	for(int i = 0; i < 3; i++) {
-		meshlink_enable_discovery(mesh[i], false);
 		assert(meshlink_set_canonical_address(mesh[i], meshlink_get_self(mesh[i]), "localhost", NULL));
 		char *data = meshlink_export(mesh[i]);
 		assert(data);
@@ -93,37 +83,11 @@ int main(void) {
 	nodes = meshlink_get_all_nodes_by_dev_class(mesh[0], DEV_CLASS_STATIONARY, nodes, &nnodes);
 	assert(nnodes == 2);
 
-	// But no node should have been online.
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], 0, -1, nodes, &nnodes);
-	assert(nnodes == 0);
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], 0, 0, nodes, &nnodes);
-	assert(nnodes == 3);
-
 	// Start foo.
 
 	time_t foo_started = time(NULL);
 	assert(meshlink_start(mesh[0]));
 
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], 0, -1, nodes, &nnodes);
-	assert(nnodes == 1);
-	assert(nodes[0] == meshlink_get_self(mesh[0]));
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], 0, 0, nodes, &nnodes);
-	assert(nnodes == 2);
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], foo_started - 1, -1, nodes, &nnodes);
-	assert(nnodes == 1);
-	assert(nodes[0] == meshlink_get_self(mesh[0]));
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], 1, foo_started - 1, nodes, &nnodes);
-	assert(nnodes == 0);
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], 1, foo_started + 1, nodes, &nnodes);
-	assert(nnodes == 1);
-	assert(nodes[0] == meshlink_get_self(mesh[0]));
-
 	// Start bar and wait for it to connect.
 
 	meshlink_set_node_status_cb(mesh[0], status_cb);
@@ -133,46 +97,15 @@ int main(void) {
 	assert(wait_sync_flag(&bar_reachable, 20));
 	time_t bar_started = time(NULL);
 
-	// Validate time ranges.
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], 0, -1, nodes, &nnodes);
-	assert(nnodes == 2);
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], 0, 0, nodes, &nnodes);
-	assert(nnodes == 1);
-	assert(nodes[0] == meshlink_get_node(mesh[0], "baz"));
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], 1, foo_started + 1, nodes, &nnodes);
-	assert(nnodes == 1);
-	assert(nodes[0] == meshlink_get_self(mesh[0]));
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], bar_started, bar_started, nodes, &nnodes);
-	assert(nnodes == 2);
-	assert(nodes[0] == meshlink_get_node(mesh[0], "bar"));
-	assert(nodes[1] == meshlink_get_self(mesh[0]));
-
 	// Stop bar.
 
 	meshlink_stop(mesh[1]);
 	sleep(2);
-	time_t bar_stopped = time(NULL);
-
-	// Validate we can see when bar was reachable.
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], bar_stopped, bar_stopped, nodes, &nnodes);
-	assert(nnodes == 1);
-	assert(nodes[0] == meshlink_get_self(mesh[0]));
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], bar_started, bar_started, nodes, &nnodes);
-	assert(nnodes == 2);
-	assert(nodes[0] == meshlink_get_node(mesh[0], "bar"));
-	assert(nodes[1] == meshlink_get_self(mesh[0]));
 
 	// Close and restart foo, check that it remembers correctly.
 
 	meshlink_close(mesh[0]);
 	sleep(2);
-	time_t foo_stopped = time(NULL);
 	mesh[0] = meshlink_open("get_all_nodes_conf.1", "foo", "get-all_nodes", DEV_CLASS_BACKBONE);
 	assert(mesh[0]);
 
@@ -186,32 +119,6 @@ int main(void) {
 	nodes = meshlink_get_all_nodes_by_dev_class(mesh[0], DEV_CLASS_STATIONARY, nodes, &nnodes);
 	assert(nnodes == 2);
 
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], 0, 0, nodes, &nnodes);
-	assert(nnodes == 1);
-	assert(nodes[0] == meshlink_get_node(mesh[0], "baz"));
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], 0, -1, nodes, &nnodes);
-	assert(nnodes == 2);
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], 1, foo_started - 1, nodes, &nnodes);
-	assert(nnodes == 0);
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], 1, foo_started + 1, nodes, &nnodes);
-	assert(nnodes == 1);
-	assert(nodes[0] == meshlink_get_self(mesh[0]));
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], bar_started, bar_started, nodes, &nnodes);
-	assert(nnodes == 2);
-	assert(nodes[0] == meshlink_get_node(mesh[0], "bar"));
-	assert(nodes[1] == meshlink_get_self(mesh[0]));
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], bar_stopped, bar_stopped, nodes, &nnodes);
-	assert(nnodes == 1);
-	assert(nodes[0] == meshlink_get_self(mesh[0]));
-
-	nodes = meshlink_get_all_nodes_by_last_reachable(mesh[0], foo_stopped, -1, nodes, &nnodes);
-	assert(nnodes == 0);
-
 	// Clean up.
 
 	for(int i = 0; i < 3; i++) {