From 1236c52a2ffeee4cc5e5077f6c4b73e072c5a9d1 Mon Sep 17 00:00:00 2001 From: Saverio Proto Date: Tue, 19 Aug 2014 16:17:20 +0200 Subject: [PATCH] manynodes: implemented /select to be able to select the node that will execute the console commands by default node0 will be executing the commands doing /select 1 for example, the node 1 will execute the console commands --- examples/manynodes.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/examples/manynodes.c b/examples/manynodes.c index 99a3e5b2..7b23fc51 100644 --- a/examples/manynodes.c +++ b/examples/manynodes.c @@ -19,6 +19,8 @@ static int n = 10; static meshlink_handle_t **mesh; +static int nodeindex = 0; + static meshlink_node_t **nodes; static size_t nnodes; @@ -93,7 +95,7 @@ static bool exportmeshgraph(const char* path) return false; } - if(!devtool_export_json_all_edges_state(mesh[0], stream)) + if(!devtool_export_json_all_edges_state(mesh[nodeindex], stream)) { fclose(stream); fprintf(stderr, "could not export graph\n"); @@ -184,7 +186,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 +199,12 @@ 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]); + meshlink_start(mesh[nodeindex]); } } else if(!strcasecmp(buf, "kick")) { if(!arg) { @@ -210,18 +212,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 +233,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 +250,14 @@ 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, "quit")) { printf("Bye!\n"); fclose(stdin); @@ -262,6 +272,7 @@ static void parse_command(char *buf) { "/link Link all nodes together.\n" "/eg Export graph as json file.\n" "/test Test functionality sending some data to all nodes\n" + "/select Select the active node running the user commands\n" "/quit Exit this program.\n" ); } else { @@ -307,7 +318,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 +330,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; } -- 2.39.5