Fix all compiler warnings found using -Wall -W -pedantic.

[meshlink] / test / invite-join.c

diff --git a/test/invite-join.c b/test/invite-join.c
index a7bee95c0f9b9440812a4bc0745b8a38174e09fb..90326a0d1d8b574e40395f97c7f5a0e05a5e11cf 100644 (file)
--- a/test/invite-join.c
+++ b/test/invite-join.c
@@ -8,29 +8,39 @@
 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;
        }
 
+       // Disable local discovery.
+
+       meshlink_enable_discovery(mesh1, false);
+       meshlink_enable_discovery(mesh2, false);
+
        // Start the first instance and have it generate an invitation.
 
        meshlink_set_node_status_cb(mesh1, status_cb);
-       
+
        if(!meshlink_start(mesh1)) {
                fprintf(stderr, "Foo could not start\n");
                return 1;
@@ -38,6 +48,7 @@ int main(int argc, char *argv[]) {
 
        meshlink_add_address(mesh1, "localhost");
        char *url = meshlink_invite(mesh1, "baz");
+
        if(!url) {
                fprintf(stderr, "Foo could not generate an invitation for baz\n");
                return 1;
@@ -61,8 +72,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 +84,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"));