X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=examples%2Fmanynodes.c;h=2cfe818033e371bc673b37a35920d5f880674a5c;hb=668664d0ea90dc81670cccd7b7d56b36b8360eaa;hp=393d586d35fc05128e31339f13bda46558ab6ea2;hpb=a9230a241a1df0328fbfbe5d1c2ee3234bf808fd;p=meshlink

diff --git a/examples/manynodes.c b/examples/manynodes.c
index 393d586d..2cfe8180 100644
--- a/examples/manynodes.c
+++ b/examples/manynodes.c
@@ -5,8 +5,10 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__APPLE__)
 #include <linux/limits.h>
+#elif defined(__APPLE__)
+#include <sys/syslimits.h>
 #endif
 
 #include "../src/meshlink.h"
@@ -18,10 +20,11 @@
 
 #include <sys/time.h>
 #include <signal.h>
+#include <assert.h>
 
 static int n = 10;
 static meshlink_handle_t **mesh;
-static char* namesprefix="machine1";
+static char *namesprefix = "machine1";
 static int nodeindex = 0;
 
 static meshlink_node_t **nodes;
@@ -35,28 +38,30 @@ static void log_message(meshlink_handle_t *mesh, meshlink_log_level_t level, con
 		[MESHLINK_ERROR] = "\x1b[31mERROR",
 		[MESHLINK_CRITICAL] = "\x1b[31mCRITICAL",
 	};
-	fprintf(stderr, "%s\t%s:\x1b[0m %s\n", mesh ? mesh->name : "global",levelstr[level], text);
+	fprintf(stderr, "%s\t%s:\x1b[0m %s\n", mesh ? mesh->name : "global", levelstr[level], text);
 }
 
 //Test mesh sending data
-static void testmesh () {
+static void testmesh() {
 
 	for(int nindex = 0; nindex < n; nindex++) {
 
-			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));
-						}
-				}
+		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));
+				}
 			}
 
+		}
+
 	}
 }
 // Make all nodes know about each other by importing each others public keys and addresses.
@@ -75,31 +80,30 @@ static void linkmesh() {
 	}
 }
 
-static bool exportmeshgraph(const char* path)
-{
+static bool exportmeshgraph(const char *path) {
+	assert(path);
+
 	struct stat ps;
 	int psr = stat(path, &ps);
 
-	if(psr == 0 || errno != ENOENT)
-	{
-		if(psr == -1)
-			{ perror("stat"); }
-		else
-			{ fprintf(stderr, "%s exists already\n", path); }
+	if(psr == 0 || errno != ENOENT) {
+		if(psr == -1) {
+			perror("stat");
+		} else {
+			fprintf(stderr, "%s exists already\n", path);
+		}
 
 		return false;
 	}
 
-	FILE* stream = fopen(path, "w");
+	FILE *stream = fopen(path, "w");
 
-	if(!stream)
-	{
+	if(!stream) {
 		perror("stream");
 		return false;
 	}
 
-	if(!devtool_export_json_all_edges_state(mesh[0], stream))
-	{
+	if(!devtool_export_json_all_edges_state(mesh[0], stream)) {
 		fclose(stream);
 		fprintf(stderr, "could not export graph\n");
 		return false;
@@ -110,13 +114,12 @@ static bool exportmeshgraph(const char* path)
 }
 
 
-void exportmeshgraph_timer(int signum)
-{
+void exportmeshgraph_timer(int signum) {
 	struct timeval ts;
 	gettimeofday(&ts, NULL);
 
 	char name[1024];
-	snprintf(name, sizeof(name), "%sgraph_%ld_%03ld.json", namesprefix,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);
 }
@@ -124,35 +127,37 @@ void exportmeshgraph_timer(int signum)
 #ifndef _WIN32
 static bool exportmeshgraph_started = false;
 
-static bool exportmeshgraph_end(const char* none)
-{
-	if(!exportmeshgraph_started)
-		{ return false; }
+static bool exportmeshgraph_end(const char *none) {
+	if(!exportmeshgraph_started) {
+		return false;
+	}
 
 	struct itimerval zero_timer = { 0 };
-	setitimer (ITIMER_REAL, &zero_timer, NULL);
+
+	setitimer(ITIMER_REAL, &zero_timer, NULL);
 
 	exportmeshgraph_started = false;
 
 	return true;
 }
 
-static bool exportmeshgraph_begin(const char* timeout_str)
-{
-	if(!timeout_str)
+static bool exportmeshgraph_begin(const char *timeout_str) {
+	if(!timeout_str) {
 		return false;
+	}
 
-	if(exportmeshgraph_started)
-	{
-		if(!exportmeshgraph_end(NULL))
+	if(exportmeshgraph_started) {
+		if(!exportmeshgraph_end(NULL)) {
 			return false;
+		}
 	}
 
 	// get timeout
 	int timeout = atoi(timeout_str);
 
-	if(timeout < 100)
-		{ timeout = 100; }
+	if(timeout < 100) {
+		timeout = 100;
+	}
 
 	int timeout_sec = timeout / 1000;
 	int timeout_msec = timeout % 1000;
@@ -170,28 +175,28 @@ static bool exportmeshgraph_begin(const char* timeout_str)
 	timer.it_interval.tv_usec = timeout_msec * 1000;
 
 	/* Start a real timer. */
-	setitimer (ITIMER_REAL, &timer, NULL);
+	setitimer(ITIMER_REAL, &timer, NULL);
 
 	exportmeshgraph_started = true;
 
 	return true;
 }
 #else
-static bool exportmeshgraph_end(const char* none)
-{
+static bool exportmeshgraph_end(const char *none) {
 	return false;
 }
 
-static bool exportmeshgraph_begin(const char* timeout_str)
-{
+static bool exportmeshgraph_begin(const char *timeout_str) {
 	return false;
 }
 #endif
 
 static void parse_command(char *buf) {
 	char *arg = strchr(buf, ' ');
-	if(arg)
+
+	if(arg) {
 		*arg++ = 0;
+	}
 
 	if(!strcasecmp(buf, "invite")) {
 		char *invitation;
@@ -202,6 +207,7 @@ static void parse_command(char *buf) {
 		}
 
 		invitation = meshlink_invite(mesh[nodeindex], arg);
+
 		if(!invitation) {
 			fprintf(stderr, "Could not invite '%s': %s\n", arg, meshlink_strerror(meshlink_errno));
 			return;
@@ -214,12 +220,18 @@ static void parse_command(char *buf) {
 			fprintf(stderr, "/join requires an argument!\n");
 			return;
 		}
+
 		meshlink_stop(mesh[nodeindex]);
-		if(!meshlink_join(mesh[nodeindex], arg))
+
+		if(!meshlink_join(mesh[nodeindex], arg)) {
 			fprintf(stderr, "Could not join using invitation: %s\n", meshlink_strerror(meshlink_errno));
-		else {
+		} else {
 			fprintf(stderr, "Invitation accepted!\n");
-			meshlink_start(mesh[nodeindex]);
+		}
+
+		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) {
@@ -228,6 +240,7 @@ static void parse_command(char *buf) {
 		}
 
 		meshlink_node_t *node = meshlink_get_node(mesh[nodeindex], arg);
+
 		if(!node) {
 			fprintf(stderr, "Unknown node '%s'\n", arg);
 			return;
@@ -239,16 +252,21 @@ static void parse_command(char *buf) {
 	} else if(!strcasecmp(buf, "who")) {
 		if(!arg) {
 			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 {
 				printf("%zu known nodes:", nnodes);
-				for(int i = 0; i < nnodes; i++)
+
+				for(int i = 0; i < nnodes; i++) {
 					printf(" %s", nodes[i]->name);
+				}
+
 				printf("\n");
 			}
 		} else {
 			meshlink_node_t *node = meshlink_get_node(mesh[nodeindex], arg);
+
 			if(!node) {
 				fprintf(stderr, "Unknown node '%s'\n", arg);
 			} else {
@@ -270,8 +288,9 @@ static void parse_command(char *buf) {
 			fprintf(stderr, "/select requires an argument!\n");
 			return;
 		}
+
 		nodeindex = atoi(arg);
-		printf("Index is now %d\n",nodeindex);
+		printf("Index is now %d\n", nodeindex);
 	} else if(!strcasecmp(buf, "stop")) {
 		meshlink_stop(mesh[nodeindex]);
 	} else if(!strcasecmp(buf, "quit")) {
@@ -279,19 +298,19 @@ static void parse_command(char *buf) {
 		fclose(stdin);
 	} else if(!strcasecmp(buf, "help")) {
 		printf(
-			"<name>: <message>     Send a message to the given node.\n"
-			"                      Subsequent messages don't need the <name>: prefix.\n"
-			"/invite <name>        Create an invitation for a new node.\n"
-			"/join <invitation>    Join an existing mesh using an invitation.\n"
-			"/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"
-			"/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"
-			);
+		        "<name>: <message>     Send a message to the given node.\n"
+		        "                      Subsequent messages don't need the <name>: prefix.\n"
+		        "/invite <name>        Create an invitation for a new node.\n"
+		        "/join <invitation>    Join an existing mesh using an invitation.\n"
+		        "/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"
+		        "/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 {
 		fprintf(stderr, "Unknown command '/%s'\n", buf);
 	}
@@ -301,28 +320,33 @@ static void parse_input(char *buf) {
 	static meshlink_node_t *destination;
 	size_t len;
 
-	if(!buf)
+	if(!buf) {
 		return;
+	}
 
 	// Remove newline.
 
 	len = strlen(buf);
 
-	if(len && buf[len - 1] == '\n')
+	if(len && buf[len - 1] == '\n') {
 		buf[--len] = 0;
+	}
 
-	if(len && buf[len - 1] == '\r')
+	if(len && buf[len - 1] == '\r') {
 		buf[--len] = 0;
+	}
 
 	// Ignore empty lines.
 
-	if(!len)
+	if(!len) {
 		return;
+	}
 
 	// Commands start with '/'
 
-	if(*buf == '/')
+	if(*buf == '/') {
 		return parse_command(buf + 1);
+	}
 
 	// Lines in the form "name: message..." set the destination node.
 
@@ -332,10 +356,13 @@ static void parse_input(char *buf) {
 	if(colon) {
 		*colon = 0;
 		msg = colon + 1;
-		if(*msg == ' ')
+
+		if(*msg == ' ') {
 			msg++;
+		}
 
 		destination = meshlink_get_node(mesh[nodeindex], buf);
+
 		if(!destination) {
 			fprintf(stderr, "Unknown node '%s'\n", buf);
 			return;
@@ -360,24 +387,28 @@ int main(int argc, char *argv[]) {
 	const char *graphexporttimeout = NULL;
 	char buf[1024];
 
-	if(argc > 1)
+	if(argc > 1) {
 		n = atoi(argv[1]);
+	}
 
 	if(n < 1) {
 		fprintf(stderr, "Usage: %s [number of local nodes] [confbase] [prefixnodenames] [graphexport timeout]\n", argv[0]);
 		return 1;
 	}
 
-	if(argc > 2)
+	if(argc > 2) {
 		basebase = argv[2];
+	}
 
-	if(argc > 3)
+	if(argc > 3) {
 		namesprefix = argv[3];
+	}
 
-	if(argc > 4)
+	if(argc > 4) {
 		graphexporttimeout = argv[4];
+	}
 
-	mesh = calloc(n, sizeof *mesh);
+	mesh = calloc(n, sizeof(*mesh));
 
 	meshlink_set_log_cb(NULL, MESHLINK_DEBUG, log_message);
 #ifndef _WIN32
@@ -388,17 +419,19 @@ int main(int argc, char *argv[]) {
 
 	char filename[PATH_MAX];
 	char nodename[100];
+
 	for(int i = 0; i < n; i++) {
-		snprintf(nodename, sizeof nodename, "%snode%d", namesprefix,i);
-		snprintf(filename, sizeof filename, "%s/%s", basebase, nodename);
-		bool itsnew = access(filename, R_OK);
-		if (n/(i+1) > n/4) {
+		snprintf(nodename, sizeof(nodename), "%snode%d", namesprefix, i);
+		snprintf(filename, sizeof(filename), "%s/%s", basebase, nodename);
+
+		if(n / (i + 1) > n / 4) {
 			mesh[i] = meshlink_open(filename, nodename, "manynodes", DEV_CLASS_BACKBONE);
-		}
-		else {
+		} 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));
@@ -409,10 +442,11 @@ int main(int argc, char *argv[]) {
 	int started = 0;
 
 	for(int i = 0; i < n; i++) {
-		if(!meshlink_start(mesh[i]))
+		if(!meshlink_start(mesh[i])) {
 			fprintf(stderr, "Could not start node %d: %s\n", i, meshlink_strerror(meshlink_errno));
-		else
+		} else {
 			started++;
+		}
 	}
 
 	if(!started) {
@@ -420,21 +454,24 @@ int main(int argc, char *argv[]) {
 		return 1;
 	}
 
-	if(graphexporttimeout)
-		{ exportmeshgraph_begin(graphexporttimeout); }
+	if(graphexporttimeout) {
+		exportmeshgraph_begin(graphexporttimeout);
+	}
 
 	printf("%d nodes started.\nType /help for a list of commands.\n", started);
 
 	// handle input
-	while(fgets(buf, sizeof buf, stdin))
+	while(fgets(buf, sizeof(buf), stdin)) {
 		parse_input(buf);
+	}
 
 	exportmeshgraph_end(NULL);
 
 	printf("Nodes stopping.\n");
 
-	for(int i = 0; i < n; i++)
+	for(int i = 0; i < n; i++) {
 		meshlink_close(mesh[i]);
+	}
 
 	return 0;
 }