X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Finvite-join.c;h=eee5fa96b016e72e716b2652e19f88e27dd879ed;hb=3a73d524bf6ea79f8badb83ec15863a546602b7b;hp=a7bee95c0f9b9440812a4bc0745b8a38174e09fb;hpb=01eaeb3c9fa60ae9c6e5b866acd9baef79622d99;p=meshlink

diff --git a/test/invite-join.c b/test/invite-join.c
index a7bee95c..eee5fa96 100644
--- a/test/invite-join.c
+++ b/test/invite-join.c
@@ -8,49 +8,75 @@
 volatile bool baz_reachable = false;
 
 void status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
-	if(!strcmp(node->name, "baz"))
+	(void)mesh;
+
+	if(!strcmp(node->name, "baz")) {
 		baz_reachable = reachable;
+	}
 }
 
-int main(int argc, char *argv[]) {
+int main() {
 	// Open two new meshlink instance.
 
-	meshlink_handle_t *mesh1 = meshlink_open("invite_join_conf.1", "foo", "invite-join");
+	meshlink_handle_t *mesh1 = meshlink_open("invite_join_conf.1", "foo", "invite-join", DEV_CLASS_BACKBONE);
+
 	if(!mesh1) {
 		fprintf(stderr, "Could not initialize configuration for foo\n");
 		return 1;
 	}
 
-	meshlink_handle_t *mesh2 = meshlink_open("invite_join_conf.2", "bar", "invite-join");
+	meshlink_handle_t *mesh2 = meshlink_open("invite_join_conf.2", "bar", "invite-join", DEV_CLASS_BACKBONE);
+
 	if(!mesh2) {
 		fprintf(stderr, "Could not initialize configuration for bar\n");
 		return 1;
 	}
 
-	// Start the first instance and have it generate an invitation.
+	meshlink_handle_t *mesh3 = meshlink_open("invite_join_conf.3", "quux", "invite-join", DEV_CLASS_BACKBONE);
+
+	if(!mesh3) {
+		fprintf(stderr, "Could not initialize configuration for quux\n");
+		return 1;
+	}
+
+	// Disable local discovery.
+
+	meshlink_enable_discovery(mesh1, false);
+	meshlink_enable_discovery(mesh2, false);
+	meshlink_enable_discovery(mesh3, false);
+
+	// Start the first instance and have it generate invitations.
 
 	meshlink_set_node_status_cb(mesh1, status_cb);
-	
+
 	if(!meshlink_start(mesh1)) {
 		fprintf(stderr, "Foo could not start\n");
 		return 1;
 	}
 
 	meshlink_add_address(mesh1, "localhost");
-	char *url = meshlink_invite(mesh1, "baz");
-	if(!url) {
+	char *baz_url = meshlink_invite(mesh1, NULL, "baz");
+
+	if(!baz_url) {
 		fprintf(stderr, "Foo could not generate an invitation for baz\n");
 		return 1;
 	}
 
+	char *quux_url = meshlink_invite(mesh1, NULL, "quux");
+
+	if(!quux_url) {
+		fprintf(stderr, "Foo could not generate an invitation for quux\n");
+		return 1;
+	}
+
 	// Have the second instance join the first.
 
-	if(!meshlink_join(mesh2, url)) {
+	if(!meshlink_join(mesh2, baz_url)) {
 		fprintf(stderr, "Baz could not join foo's mesh\n");
 		return 1;
 	}
 
-	free(url);
+	free(baz_url);
 
 	if(!meshlink_start(mesh2)) {
 		fprintf(stderr, "Baz could not start\n");
@@ -61,8 +87,10 @@ int main(int argc, char *argv[]) {
 
 	for(int i = 0; i < 60; i++) {
 		sleep(1);
-		if(baz_reachable)
+
+		if(baz_reachable) {
 			break;
+		}
 	}
 
 	if(!baz_reachable) {
@@ -71,6 +99,7 @@ int main(int argc, char *argv[]) {
 	}
 
 	int pmtu = meshlink_get_pmtu(mesh1, meshlink_get_node(mesh1, "baz"));
+
 	for(int i = 0; i < 10 && !pmtu; i++) {
 		sleep(1);
 		pmtu = meshlink_get_pmtu(mesh1, meshlink_get_node(mesh1, "baz"));
@@ -81,6 +110,17 @@ int main(int argc, char *argv[]) {
 		return 1;
 	}
 
+	// Check that nodes cannot join with expired invitations
+
+	meshlink_set_invitation_timeout(mesh1, 0);
+
+	if(meshlink_join(mesh3, quux_url)) {
+		fprintf(stderr, "Quux could join foo's mesh using an outdated invitation\n");
+		return 1;
+	}
+
+	free(quux_url);
+
 	// Clean up.
 
 	meshlink_stop(mesh2);