X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=examples%2Fchatpp.cc;h=e500ad2733547b63fcd29ef46293061baafc5767;hb=b70895cf367100792263f04d97a7533b26c5ece3;hp=864a3e809b7258d20f8dcc7dcf561d3bb4c1d4aa;hpb=a67bc2279c8a562c9b162a75c7cfd09e2a59d17f;p=meshlink

diff --git a/examples/chatpp.cc b/examples/chatpp.cc
index 864a3e80..e500ad27 100644
--- a/examples/chatpp.cc
+++ b/examples/chatpp.cc
@@ -4,28 +4,35 @@
 #include <strings.h>
 #include "../src/meshlink++.h"
 
-static void log_message(meshlink::mesh *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::mesh *mesh, meshlink::node *source, const void *data, size_t len) {
-	const char *msg = (const char *)data;
+class ChatMesh : public meshlink::mesh
+{
+public:
+	void log(meshlink::log_level_t level, const char *text) {
+		const char *levelstr[] = {"DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"};
+		fprintf(stderr, "%s: %s\n", levelstr[level], text);
+		}
 
-	if(!len || msg[len - 1]) {
-		fprintf(stderr, "Received invalid data from %s\n", source->name);
-		return;
+	void receive(meshlink::node *source, const void *data, size_t len) {
+		const char *msg = (const char *)data;
+	
+		if(!len || msg[len - 1]) {
+			fprintf(stderr, "Received invalid data from %s\n", source->name);
+			return;
+		}
+		
+		printf("%s says: %s\n", source->name, msg);
 	}
 
-	printf("%s says: %s\n", source->name, msg);
-}
+	void node_status(meshlink::node *node, bool reachable) {
+		if(reachable)
+			printf("%s joined.\n", node->name);
+		else
+			printf("%s left.\n", node->name);
+	}
+};
 
-static void node_status(meshlink::mesh *mesh, meshlink::node *node, bool reachable) {
-	if(reachable)
-		printf("%s joined.\n", node->name);
-	else
-		printf("%s left.\n", node->name);
-}
+static meshlink::node **nodes;
+static size_t nnodes;
 
 static void parse_command(meshlink::mesh *mesh, char *buf) {
 	char *arg = strchr(buf, ' ');
@@ -42,7 +49,7 @@ static void parse_command(meshlink::mesh *mesh, char *buf) {
 
 		invitation = mesh->invite(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());
 			return;
 		}
 
@@ -55,7 +62,7 @@ static void parse_command(meshlink::mesh *mesh, char *buf) {
 		}
 
 		if(!mesh->join(arg))
-			fprintf(stderr, "Could not join using invitation: %s\n", mesh->errstr);
+			fprintf(stderr, "Could not join using invitation: %s\n", meshlink::strerror());
 		else
 			fprintf(stderr, "Invitation accepted!\n");
 	} else if(!strcasecmp(buf, "kick")) {
@@ -66,7 +73,7 @@ static void parse_command(meshlink::mesh *mesh, char *buf) {
 
 		meshlink::node *node = mesh->get_node(arg);
 		if(!node) {
-			fprintf(stderr, "Unknown node '%s'\n", arg);
+			fprintf(stderr, "Error looking up '%s': %s\n", arg, meshlink::strerror());
 			return;
 		}
 
@@ -75,22 +82,19 @@ static void parse_command(meshlink::mesh *mesh, char *buf) {
 		printf("Node '%s' blacklisted.\n", arg);
 	} else if(!strcasecmp(buf, "who")) {
 		if(!arg) {
-			meshlink::node *nodes[100];
-			size_t n = mesh->get_all_nodes(nodes, 100);
-			if(!n) {
-				fprintf(stderr, "No nodes known!\n");
+			nodes = mesh->get_all_nodes(nodes, &nnodes);
+			if(!nodes) {
+				fprintf(stderr, "Could not get list of nodes: %s\n", meshlink::strerror());
 			} else {
-				printf("Known nodes:");
-				for(int i = 0; i < n && i < 100; i++)
+				printf("%zu known nodes:", nnodes);
+				for(size_t i = 0; i < nnodes; i++)
 					printf(" %s", nodes[i]->name);
-				if(n > 100)
-					printf(" (and %zu more)", n - 100);
 				printf("\n");
 			}
 		} else {
 			meshlink::node *node = mesh->get_node(arg);
 			if(!node) {
-				fprintf(stderr, "Unknown node '%s'\n", arg);
+				fprintf(stderr, "Error looking up '%s': %s\n", arg, meshlink::strerror());
 			} else {
 				printf("Node %s found\n", arg);
 			}
@@ -153,7 +157,7 @@ static void parse_input(meshlink::mesh *mesh, char *buf) {
 
 		destination = mesh->get_node(buf);
 		if(!destination) {
-			fprintf(stderr, "Unknown node '%s'\n", buf);
+			fprintf(stderr, "Error looking up '%s': %s\n", buf, meshlink::strerror());
 			return;
 		}
 	}
@@ -164,13 +168,14 @@ static void parse_input(meshlink::mesh *mesh, char *buf) {
 	}
 
 	if(!mesh->send(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());
 		return;
 	}
 
 	printf("Message sent to '%s'.\n", destination->name);
 }
 
+
 int main(int argc, char *argv[]) {
 	const char *confbase = ".chat";
 	const char *nick = NULL;
@@ -182,18 +187,15 @@ int main(int argc, char *argv[]) {
 	if(argc > 2)
 		nick = argv[2];
 
-	meshlink::mesh *mesh = meshlink::open(confbase, nick);
+	ChatMesh* mesh = meshlink::open<ChatMesh>(confbase, nick, "chatpp", STATIONARY);
+
 	if(!mesh) {
-		fprintf(stderr, "Could not open MeshLink!\n");
+		fprintf(stderr, "Could not open MeshLink: %s\n", meshlink::strerror());
 		return 1;
 	}
 
-	mesh->set_receive_cb(receive);
-	mesh->set_node_status_cb(node_status);
-	mesh->set_log_cb(MESHLINK_INFO, log_message);
-
 	if(!mesh->start()) {
-		fprintf(stderr, "Could not start MeshLink: %s\n", mesh->errstr);
+		fprintf(stderr, "Could not start MeshLink: %s\n", meshlink::strerror());
 		return 1;
 	}