Restart the mesh after a failed join() in the other examples as well.

[meshlink] / examples / manynodes.c

diff --git a/examples/manynodes.c b/examples/manynodes.c
index 99a3e5b2dd806a15d2f32fd5f337b653695691e6..0aafbcef25c661aa03a0825783ffdb119ffe5ce8 100644 (file)
--- a/examples/manynodes.c
+++ b/examples/manynodes.c
@@ -4,7 +4,12 @@
 #include <strings.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+
+#if !defined(_WIN32) && !defined(__APPLE__)
 #include <linux/limits.h>
+#elif defined(__APPLE__)
+#include <sys/syslimits.h>
+#endif
 
 #include "../src/meshlink.h"
 #include "../src/devtools.h"
@@ -18,6 +23,8 @@
 
 static int n = 10;
 static meshlink_handle_t **mesh;
+static char* namesprefix="machine1";
+static int nodeindex = 0;
 
 static meshlink_node_t **nodes;
 static size_t nnodes;
@@ -111,11 +118,12 @@ void exportmeshgraph_timer(int signum)
        gettimeofday(&ts, NULL);
 
        char name[1024];
-       snprintf(name, sizeof(name), "graph_%ld_%03ld.json", ts.tv_sec, ts.tv_usec/1000);
+       snprintf(name, sizeof(name), "%sgraph_%ld_%03ld.json", namesprefix,ts.tv_sec, ts.tv_usec/1000);
 
        exportmeshgraph(name);
 }
 
+#ifndef _WIN32
 static bool exportmeshgraph_started = false;
 
 static bool exportmeshgraph_end(const char* none)
@@ -170,6 +178,17 @@ static bool exportmeshgraph_begin(const char* timeout_str)
 
        return true;
 }
+#else
+static bool exportmeshgraph_end(const char* none)
+{
+       return false;
+}
+
+static bool exportmeshgraph_begin(const char* timeout_str)
+{
+       return false;
+}
+#endif
 
 static void parse_command(char *buf) {
        char *arg = strchr(buf, ' ');
@@ -184,7 +203,7 @@ static void parse_command(char *buf) {
                        return;
                }
 
-               invitation = meshlink_invite(mesh[0], arg);
+               invitation = meshlink_invite(mesh[nodeindex], arg);
                if(!invitation) {
                        fprintf(stderr, "Could not invite '%s': %s\n", arg, meshlink_strerror(meshlink_errno));
                        return;
@@ -197,12 +216,15 @@ static void parse_command(char *buf) {
                        fprintf(stderr, "/join requires an argument!\n");
                        return;
                }
-               meshlink_stop(mesh[0]);
-               if(!meshlink_join(mesh[0], arg))
+               meshlink_stop(mesh[nodeindex]);
+               if(!meshlink_join(mesh[nodeindex], arg))
                        fprintf(stderr, "Could not join using invitation: %s\n", meshlink_strerror(meshlink_errno));
                else {
                        fprintf(stderr, "Invitation accepted!\n");
-                       meshlink_start(mesh[0]);
+               }
+               if(!meshlink_start(mesh[nodeindex])) {
+                       fprintf(stderr, "Could not restart MeshLink: %s\n", meshlink_strerror(meshlink_errno));
+                       exit(1);
                }
        } else if(!strcasecmp(buf, "kick")) {
                if(!arg) {
@@ -210,18 +232,18 @@ static void parse_command(char *buf) {
                        return;
                }
 
-               meshlink_node_t *node = meshlink_get_node(mesh[0], arg);
+               meshlink_node_t *node = meshlink_get_node(mesh[nodeindex], arg);
                if(!node) {
                        fprintf(stderr, "Unknown node '%s'\n", arg);
                        return;
                }
 
-               meshlink_blacklist(mesh[0], node);
+               meshlink_blacklist(mesh[nodeindex], node);
 
                printf("Node '%s' blacklisted.\n", arg);
        } else if(!strcasecmp(buf, "who")) {
                if(!arg) {
-                       nodes = meshlink_get_all_nodes(mesh[0], nodes, &nnodes);
+                       nodes = meshlink_get_all_nodes(mesh[nodeindex], nodes, &nnodes);
                        if(!nodes) {
                                fprintf(stderr, "Could not get list of nodes: %s\n", meshlink_strerror(meshlink_errno));
                        } else {
@@ -231,11 +253,11 @@ static void parse_command(char *buf) {
                                printf("\n");
                        }
                } else {
-                       meshlink_node_t *node = meshlink_get_node(mesh[0], arg);
+                       meshlink_node_t *node = meshlink_get_node(mesh[nodeindex], arg);
                        if(!node) {
                                fprintf(stderr, "Unknown node '%s'\n", arg);
                        } else {
-                               printf("Node %s found, pmtu %zd\n", arg, meshlink_get_pmtu(mesh[0], node));
+                               printf("Node %s found, pmtu %zd\n", arg, meshlink_get_pmtu(mesh[nodeindex], node));
                        }
                }
        } else if(!strcasecmp(buf, "link")) {
@@ -248,6 +270,15 @@ static void parse_command(char *buf) {
                exportmeshgraph_end(NULL);
        } else if(!strcasecmp(buf, "test")) {
                testmesh();
+       } else if(!strcasecmp(buf, "select")) {
+               if(!arg) {
+                       fprintf(stderr, "/select requires an argument!\n");
+                       return;
+               }
+               nodeindex = atoi(arg);
+               printf("Index is now %d\n",nodeindex);
+       } else if(!strcasecmp(buf, "stop")) {
+               meshlink_stop(mesh[nodeindex]);
        } else if(!strcasecmp(buf, "quit")) {
                printf("Bye!\n");
                fclose(stdin);
@@ -262,6 +293,8 @@ static void parse_command(char *buf) {
                        "/link                 Link all nodes together.\n"
                        "/eg <path>            Export graph as json file.\n"
                        "/test                 Test functionality sending some data to all nodes\n"
+                       "/select <number>      Select the active node running the user commands\n"
+                       "/stop                 Call meshlink_stop, use /select first to select which node to stop\n"
                        "/quit                 Exit this program.\n"
                        );
        } else {
@@ -307,7 +340,7 @@ static void parse_input(char *buf) {
                if(*msg == ' ')
                        msg++;
 
-               destination = meshlink_get_node(mesh[0], buf);
+               destination = meshlink_get_node(mesh[nodeindex], buf);
                if(!destination) {
                        fprintf(stderr, "Unknown node '%s'\n", buf);
                        return;
@@ -319,7 +352,7 @@ static void parse_input(char *buf) {
                return;
        }
 
-       if(!meshlink_send(mesh[0], destination, msg, strlen(msg) + 1)) {
+       if(!meshlink_send(mesh[nodeindex], destination, msg, strlen(msg) + 1)) {
                fprintf(stderr, "Could not send message to '%s': %s\n", destination->name, meshlink_strerror(meshlink_errno));
                return;
        }
@@ -329,7 +362,6 @@ static void parse_input(char *buf) {
 
 int main(int argc, char *argv[]) {
        const char *basebase = ".manynodes";
-       const char *namesprefix = "machine1";
        const char *graphexporttimeout = NULL;
        char buf[1024];
 
@@ -352,8 +384,12 @@ int main(int argc, char *argv[]) {
 
        mesh = calloc(n, sizeof *mesh);
 
-       meshlink_set_log_cb(NULL, MESHLINK_WARNING, log_message);
+       meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_message);
+#ifndef _WIN32
        mkdir(basebase, 0750);
+#else
+       mkdir(basebase);
+#endif
 
        char filename[PATH_MAX];
        char nodename[100];
@@ -361,8 +397,13 @@ int main(int argc, char *argv[]) {
                snprintf(nodename, sizeof nodename, "%snode%d", namesprefix,i);
                snprintf(filename, sizeof filename, "%s/%s", basebase, nodename);
                bool itsnew = access(filename, R_OK);
-               mesh[i] = meshlink_open(filename, nodename, "manynodes", i%_DEV_CLASS_MAX);
-               meshlink_set_log_cb(mesh[i], MESHLINK_WARNING, log_message);
+               if (n/(i+1) > n/4) {
+                       mesh[i] = meshlink_open(filename, nodename, "manynodes", DEV_CLASS_BACKBONE);
+               }
+               else {
+                       mesh[i] = meshlink_open(filename, nodename, "manynodes", DEV_CLASS_PORTABLE);
+               }
+               meshlink_set_log_cb(mesh[i], MESHLINK_DEBUG, log_message);
                if(!mesh[i]) {
                        fprintf(stderr, "errno is: %d\n", meshlink_errno);
                        fprintf(stderr, "Could not open %s: %s\n", filename, meshlink_strerror(meshlink_errno));