X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=examples%2Fchat.c;h=ddb43bf7c477aa6eee66718e37d8208ea539de14;hb=733ef19ab996933c361f5b4f65fd768148a2d07b;hp=78f9eb27d5e1f21be3ec96248eb98f77cf4834fc;hpb=ae2beb99a42825d3b4fb77c15abfc8bad9bf0923;p=meshlink

diff --git a/examples/chat.c b/examples/chat.c
index 78f9eb27..ddb43bf7 100644
--- a/examples/chat.c
+++ b/examples/chat.c
@@ -1,20 +1,23 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include "../src/meshlink.h"
 
-static void log(meshlink_handle_t *mesh, meshlink_log_level_t level, const char *text) {
+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);
 }
 
-static void receive(meshlink_handle_t *mesh, meshlink_node_t *source, const char *data, size_t len) {
-	if(!len || data[len - 1]) {
+static void receive(meshlink_handle_t *mesh, meshlink_node_t *source, const void *data, size_t len) {
+	const char *msg = data;
+
+	if(!len || msg[len - 1]) {
 		fprintf(stderr, "Received invalid data from %s\n", source->name);
 		return;
 	}
 
-	printf("%s says: %s\n", source->name, data);
+	printf("%s says: %s\n", source->name, msg);
 }
 
 static void node_status(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) {
@@ -24,6 +27,9 @@ static void node_status(meshlink_handle_t *mesh, meshlink_node_t *node, bool rea
 		printf("%s left.\n", node->name);
 }
 
+static meshlink_node_t **nodes;
+static size_t nnodes;
+
 static void parse_command(meshlink_handle_t *mesh, char *buf) {
 	char *arg = strchr(buf, ' ');
 	if(arg)
@@ -39,7 +45,7 @@ static void parse_command(meshlink_handle_t *mesh, char *buf) {
 
 		invitation = meshlink_invite(mesh, arg);
 		if(!invitation) {
-			fprintf(stderr, "Could not invite '%s': %s\n", arg, mesh->errstr);
+			fprintf(stderr, "Could not invite '%s': %s\n", arg, meshlink_strerror(meshlink_errno));
 			return;
 		}
 
@@ -50,11 +56,16 @@ static void parse_command(meshlink_handle_t *mesh, char *buf) {
 			fprintf(stderr, "/join requires an argument!\n");
 			return;
 		}
-
+		meshlink_stop(mesh);
 		if(!meshlink_join(mesh, arg))
-			fprintf(stderr, "Could not join using invitation: %s\n", mesh->errstr);
-		else
+			fprintf(stderr, "Could not join using invitation: %s\n", meshlink_strerror(meshlink_errno));
+		else {
 			fprintf(stderr, "Invitation accepted!\n");
+			if(!meshlink_start(mesh)) {
+				fprintf(stderr, "Could not start MeshLink: %s\n", meshlink_strerror(meshlink_errno));
+			return;
+			}
+		}
 	} else if(!strcasecmp(buf, "kick")) {
 		if(!arg) {
 			fprintf(stderr, "/kick requires an argument!\n");
@@ -63,16 +74,45 @@ 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);
 
 		printf("Node '%s' blacklisted.\n", arg);
+	} else if(!strcasecmp(buf, "who")) {
+		if(!arg) {
+			nodes = meshlink_get_all_nodes(mesh, nodes, &nnodes);
+			if(!nnodes) {
+				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++)
+					printf(" %s", nodes[i]->name);
+				printf("\n");
+			}
+		} else {
+			meshlink_node_t *node = meshlink_get_node(mesh, arg);
+			if(!node) {
+				fprintf(stderr, "Error looking up '%s': %s\n", arg, meshlink_strerror(meshlink_errno));
+			} else {
+				printf("Node %s found\n", arg);
+			}
+		}
 	} else if(!strcasecmp(buf, "quit")) {
 		printf("Bye!\n");
 		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"
+			);
 	} else {
 		fprintf(stderr, "Unknown command '/%s'\n", buf);
 	}
@@ -118,7 +158,7 @@ static void parse_input(meshlink_handle_t *mesh, char *buf) {
 
 		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;
 		}
 	}
@@ -129,7 +169,7 @@ static void parse_input(meshlink_handle_t *mesh, char *buf) {
 	}
 
 	if(!meshlink_send(mesh, destination, msg, strlen(msg) + 1)) {
-		fprintf(stderr, "Could not send message to '%s': %s\n", destination->name, mesh->errstr);
+		fprintf(stderr, "Could not send message to '%s': %s\n", destination->name, meshlink_strerror(meshlink_errno));
 		return;
 	}
 
@@ -147,22 +187,22 @@ int main(int argc, char *argv[]) {
 	if(argc > 2)
 		nick = argv[2];
 
-	meshlink_handle_t *mesh = meshlink_open(confbase, nick);
+	meshlink_handle_t *mesh = meshlink_open(confbase, nick, "chat");
 	if(!mesh) {
-		fprintf(stderr, "Could not open MeshLink: %s\n", mesh->errstr);
+		fprintf(stderr, "Could not open MeshLink: %s\n", meshlink_strerror(meshlink_errno));
 		return 1;
 	}
 
 	meshlink_set_receive_cb(mesh, receive);
-	meshlink_set_node_status_cb(mesh, node_changed);
-	meshlink_set_log_cb(mesh, MESHLINK_INFO, log);
+	meshlink_set_node_status_cb(mesh, node_status);
+	meshlink_set_log_cb(mesh, MESHLINK_INFO, log_message);
 
 	if(!meshlink_start(mesh)) {
-		fprintf(stderr, "Could not start MeshLink: %s\n", mesh->errstr);
+		fprintf(stderr, "Could not start MeshLink: %s\n", meshlink_strerror(meshlink_errno));
 		return 1;
 	}
 
-	printf("Chat started.\n");
+	printf("Chat started.\nType /help for a list of commands.\n");
 
 	while(fgets(buf, sizeof buf, stdin))
 		parse_input(mesh, buf);