X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=examples%2Fchat.c;h=88fe127a1df25368512078c89868a0dddc2336c6;hp=3dbbb86019bb8713d47b7cdcd1068f3a90d638fd;hb=HEAD;hpb=9ff28ad77a6deee4db709c127c843f9fdd68e03b

diff --git a/examples/chat.c b/examples/chat.c
index 3dbbb860..88fe127a 100644
--- a/examples/chat.c
+++ b/examples/chat.c
@@ -5,11 +5,22 @@
 #include "../src/meshlink.h"
 
 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);
+	(void)mesh;
+
+	static 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:\x1b[0m %s\n", levelstr[level], text);
 }
 
 static void receive(meshlink_handle_t *mesh, meshlink_node_t *source, const void *data, size_t len) {
+	(void)mesh;
+
 	const char *msg = data;
 
 	if(!len || msg[len - 1]) {
@@ -21,10 +32,13 @@ static void receive(meshlink_handle_t *mesh, meshlink_node_t *source, const void
 }
 
 static void node_status(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
-	if(reachable)
+	(void)mesh;
+
+	if(reachable) {
 		printf("%s joined.\n", node->name);
-	else
+	} else {
 		printf("%s left.\n", node->name);
+	}
 }
 
 static meshlink_node_t **nodes;
@@ -32,8 +46,10 @@ static size_t nnodes;
 
 static void parse_command(meshlink_handle_t *mesh, char *buf) {
 	char *arg = strchr(buf, ' ');
-	if(arg)
+
+	if(arg) {
 		*arg++ = 0;
+	}
 
 	if(!strcasecmp(buf, "invite")) {
 		char *invitation;
@@ -43,7 +59,8 @@ static void parse_command(meshlink_handle_t *mesh, char *buf) {
 			return;
 		}
 
-		invitation = meshlink_invite(mesh, arg);
+		invitation = meshlink_invite(mesh, NULL, arg);
+
 		if(!invitation) {
 			fprintf(stderr, "Could not invite '%s': %s\n", arg, meshlink_strerror(meshlink_errno));
 			return;
@@ -57,10 +74,18 @@ static void parse_command(meshlink_handle_t *mesh, char *buf) {
 			return;
 		}
 
-		if(!meshlink_join(mesh, arg))
+		meshlink_stop(mesh);
+
+		if(!meshlink_join(mesh, arg)) {
 			fprintf(stderr, "Could not join using invitation: %s\n", meshlink_strerror(meshlink_errno));
-		else
+		} else {
 			fprintf(stderr, "Invitation accepted!\n");
+		}
+
+		if(!meshlink_start(mesh)) {
+			fprintf(stderr, "Could not restart MeshLink: %s\n", meshlink_strerror(meshlink_errno));
+			exit(1);
+		}
 	} else if(!strcasecmp(buf, "kick")) {
 		if(!arg) {
 			fprintf(stderr, "/kick requires an argument!\n");
@@ -68,29 +93,57 @@ static void parse_command(meshlink_handle_t *mesh, char *buf) {
 		}
 
 		meshlink_node_t *node = meshlink_get_node(mesh, arg);
+
 		if(!node) {
-			fprintf(stderr, "Unknown node '%s'\n", arg);
+			fprintf(stderr, "Error looking up '%s': %s\n", arg, meshlink_strerror(meshlink_errno));
 			return;
 		}
 
-		meshlink_blacklist(mesh, node);
+		if(!meshlink_blacklist(mesh, node)) {
+			fprintf(stderr, "Error blacklising '%s': %s", arg, meshlink_strerror(meshlink_errno));
+			return;
+		}
 
 		printf("Node '%s' blacklisted.\n", arg);
+	} else if(!strcasecmp(buf, "whitelist")) {
+		if(!arg) {
+			fprintf(stderr, "/whitelist requires an argument!\n");
+			return;
+		}
+
+		meshlink_node_t *node = meshlink_get_node(mesh, arg);
+
+		if(!node) {
+			fprintf(stderr, "Error looking up '%s': %s\n", arg, meshlink_strerror(meshlink_errno));
+			return;
+		}
+
+		if(!meshlink_whitelist(mesh, node)) {
+			fprintf(stderr, "Error whitelising '%s': %s", arg, meshlink_strerror(meshlink_errno));
+			return;
+		}
+
+		printf("Node '%s' whitelisted.\n", arg);
 	} else if(!strcasecmp(buf, "who")) {
 		if(!arg) {
 			nodes = meshlink_get_all_nodes(mesh, nodes, &nnodes);
+
 			if(!nnodes) {
-				fprintf(stderr, "No nodes known!\n");
+				fprintf(stderr, "Could not get list of nodes: %s\n", meshlink_strerror(meshlink_errno));
 			} else {
-				printf("Known nodes:");
-				for(int i = 0; i < nnodes; i++)
+				printf("%zu known nodes:", nnodes);
+
+				for(size_t i = 0; i < nnodes; i++) {
 					printf(" %s", nodes[i]->name);
+				}
+
 				printf("\n");
 			}
 		} else {
 			meshlink_node_t *node = meshlink_get_node(mesh, arg);
+
 			if(!node) {
-				fprintf(stderr, "Unknown node '%s'\n", arg);
+				fprintf(stderr, "Error looking up '%s': %s\n", arg, meshlink_strerror(meshlink_errno));
 			} else {
 				printf("Node %s found\n", arg);
 			}
@@ -100,14 +153,14 @@ static void parse_command(meshlink_handle_t *mesh, 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"
-			"/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"
+		        "/quit                 Exit this program.\n"
+		);
 	} else {
 		fprintf(stderr, "Unknown command '/%s'\n", buf);
 	}
@@ -117,28 +170,34 @@ static void parse_input(meshlink_handle_t *mesh, 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 == '/')
-		return parse_command(mesh, buf + 1);
+	if(*buf == '/') {
+		parse_command(mesh, buf + 1);
+		return;
+	}
 
 	// Lines in the form "name: message..." set the destination node.
 
@@ -148,12 +207,15 @@ static void parse_input(meshlink_handle_t *mesh, char *buf) {
 	if(colon) {
 		*colon = 0;
 		msg = colon + 1;
-		if(*msg == ' ')
+
+		if(*msg == ' ') {
 			msg++;
+		}
 
 		destination = meshlink_get_node(mesh, buf);
+
 		if(!destination) {
-			fprintf(stderr, "Unknown node '%s'\n", buf);
+			fprintf(stderr, "Error looking up '%s': %s\n", buf, meshlink_strerror(meshlink_errno));
 			return;
 		}
 	}
@@ -176,15 +238,20 @@ int main(int argc, char *argv[]) {
 	const char *nick = NULL;
 	char buf[1024];
 
-	if(argc > 1)
+	if(argc > 1) {
 		confbase = argv[1];
+	}
 
-	if(argc > 2)
+	if(argc > 2) {
 		nick = argv[2];
+	}
+
+	meshlink_set_log_cb(NULL, MESHLINK_INFO, log_message);
+
+	meshlink_handle_t *mesh = meshlink_open(confbase, nick, "chat", DEV_CLASS_STATIONARY);
 
-	meshlink_handle_t *mesh = meshlink_open(confbase, nick);
 	if(!mesh) {
-		fprintf(stderr, "Could not open MeshLink!\n");
+		fprintf(stderr, "Could not open MeshLink: %s\n", meshlink_strerror(meshlink_errno));
 		return 1;
 	}
 
@@ -199,8 +266,9 @@ int main(int argc, char *argv[]) {
 
 	printf("Chat started.\nType /help for a list of commands.\n");
 
-	while(fgets(buf, sizeof buf, stdin))
+	while(fgets(buf, sizeof(buf), stdin)) {
 		parse_input(mesh, buf);
+	}
 
 	printf("Chat stopping.\n");