Merge branch 'mesh_topology_output' into roles

[meshlink] / examples / manynodes.c

diff --git a/examples/manynodes.c b/examples/manynodes.c
index e2b1630cf4ab15da68ffb78cc2004214ff8cd2b6..22ebad2145e52ae1cb5d75b595f9c6f756e06c1a 100644 (file)
--- a/examples/manynodes.c
+++ b/examples/manynodes.c
@@ -8,32 +8,44 @@
 
 #include "../src/meshlink.h"
 
-static int n = 100;
+static int n = 10;
 static meshlink_handle_t **mesh;
 
+static meshlink_node_t **nodes;
+static size_t nnodes;
+
 static void log_message(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *text) {
-       const char *levelstr[] = {"DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"};
-       fprintf(stderr, "%s: %s\n", levelstr[level], text);
+       const char *levelstr[] = {
+               [MESHLINK_DEBUG] = "\x1b[34mDEBUG",
+               [MESHLINK_INFO] = "\x1b[32mINFO",
+               [MESHLINK_WARNING] = "\x1b[33mWARNING",
+               [MESHLINK_ERROR] = "\x1b[31mERROR",
+               [MESHLINK_CRITICAL] = "\x1b[31mCRITICAL",
+       };
+       fprintf(stderr, "%s\t%s:\x1b[0m %s\n", mesh ? mesh->name : "global",levelstr[level], text);
 }
 
-static void receive(meshlink_handle_t *mesh, meshlink_node_t *source, const void *data, size_t len) {
-       const char *msg = data;
+//Test mesh sending data
+static void testmesh () {
 
-       if(!len || msg[len - 1]) {
-               fprintf(stderr, "Received invalid data from %s\n", source->name);
-               return;
-       }
+       for(int nindex = 0; nindex < n; nindex++) {
 
-       printf("%s says: %s\n", source->name, msg);
-}
+                       nodes = meshlink_get_all_nodes(mesh[nindex], nodes, &nnodes);
+                       if(!nodes) {
+                               fprintf(stderr, "Could not get list of nodes: %s\n", meshlink_strerror(meshlink_errno));
+                       } else {
+                               printf("%zu known nodes:\n", nnodes);
+                               for(int i = 0; i < nnodes; i++) {
+                                       //printf(" %s\n", nodes[i]->name);
+                                               if(!meshlink_send(mesh[nindex], nodes[i], "magic", strlen("magic") + 1)) {
+               fprintf(stderr, "Could not send message to '%s': %s\n", nodes[i]->name, meshlink_strerror(meshlink_errno));
+                                               }
+                               }
 
-static void node_status(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
-       if(reachable)
-               printf("%s joined.\n", node->name);
-       else
-               printf("%s left.\n", node->name);
-}
+                       }
 
+       }
+}
 // Make all nodes know about each other by importing each others public keys and addresses.
 static void linkmesh() {
        for(int i = 0; i < n; i++) {
@@ -76,11 +88,13 @@ static void parse_command(char *buf) {
                        fprintf(stderr, "/join requires an argument!\n");
                        return;
                }
-
+               meshlink_stop(mesh[0]);
                if(!meshlink_join(mesh[0], arg))
                        fprintf(stderr, "Could not join using invitation: %s\n", meshlink_strerror(meshlink_errno));
-               else
+               else {
                        fprintf(stderr, "Invitation accepted!\n");
+                       meshlink_start(mesh[0]);
+               }
        } else if(!strcasecmp(buf, "kick")) {
                if(!arg) {
                        fprintf(stderr, "/kick requires an argument!\n");
@@ -98,16 +112,13 @@ static void parse_command(char *buf) {
                printf("Node '%s' blacklisted.\n", arg);
        } else if(!strcasecmp(buf, "who")) {
                if(!arg) {
-                       meshlink_node_t *nodes[100];
-                       size_t n = meshlink_get_all_nodes(mesh[0], nodes, 100);
-                       if(!n) {
-                               fprintf(stderr, "No nodes known!\n");
+                       nodes = meshlink_get_all_nodes(mesh[0], nodes, &nnodes);
+                       if(!nodes) {
+                               fprintf(stderr, "Could not get list of nodes: %s\n", meshlink_strerror(meshlink_errno));
                        } else {
-                               printf("Known nodes:");
-                               for(int i = 0; i < n && i < 100; i++)
+                               printf("%zu known nodes:", nnodes);
+                               for(int i = 0; i < nnodes; i++)
                                        printf(" %s", nodes[i]->name);
-                               if(n > 100)
-                                       printf(" (and %zu more)", n - 100);
                                printf("\n");
                        }
                } else {
@@ -115,11 +126,13 @@ static void parse_command(char *buf) {
                        if(!node) {
                                fprintf(stderr, "Unknown node '%s'\n", arg);
                        } else {
-                               printf("Node %s found\n", arg);
+                               printf("Node %s found, pmtu %zd\n", arg, meshlink_get_pmtu(mesh[0], node));
                        }
                }
        } else if(!strcasecmp(buf, "link")) {
                linkmesh();
+       } else if(!strcasecmp(buf, "test")) {
+               testmesh();
        } else if(!strcasecmp(buf, "quit")) {
                printf("Bye!\n");
                fclose(stdin);
@@ -132,6 +145,7 @@ static void parse_command(char *buf) {
                        "/kick <name>          Blacklist the given node.\n"
                        "/who [<name>]         List all nodes or show information about the given node.\n"
                        "/link                 Link all nodes together.\n"
+                       "/test                 Test functionality sending some data to all nodes\n"
                        "/quit                 Exit this program.\n"
                        );
        } else {
@@ -199,30 +213,36 @@ static void parse_input(char *buf) {
 
 int main(int argc, char *argv[]) {
        const char *basebase = ".manynodes";
+       const char *namesprefix = "machine1";
        char buf[1024];
 
        if(argc > 1)
                n = atoi(argv[1]);
 
        if(n < 1) {
-               fprintf(stderr, "Usage: %s [number of local nodes] [confbase]\n", argv[0]);
+               fprintf(stderr, "Usage: %s [number of local nodes] [confbase] [prefixnodenames]\n", argv[0]);
                return 1;
        }
 
        if(argc > 2)
                basebase = argv[2];
 
+       if(argc > 3)
+               namesprefix = argv[3];
+
        mesh = calloc(n, sizeof *mesh);
 
+       meshlink_set_log_cb(NULL, MESHLINK_INFO, log_message);
        mkdir(basebase, 0750);
 
        char filename[PATH_MAX];
        char nodename[100];
        for(int i = 0; i < n; i++) {
-               snprintf(nodename, sizeof nodename, "node%d", i);
+               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");
+               mesh[i] = meshlink_open(filename, nodename, "manynodes", DEV_CLASS_PORTABLE);
+               meshlink_set_log_cb(mesh[i], MESHLINK_INFO, log_message);
                if(itsnew)
                        meshlink_add_address(mesh[i], "localhost");
                if(!mesh[i]) {