X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=examples%2Fchat.c;h=21ced7b092ad0ee17d1021581e3bbddf506e7bc0;hb=f7bacce5e9fb1363a503970b00d601c3d1d7bd12;hp=36ffd6b1cc2d92703de850be483ce8e285d06a1c;hpb=86eb0cd8327f67354d4265467c1e0796af65b40c;p=meshlink

diff --git a/examples/chat.c b/examples/chat.c
index 36ffd6b1..21ced7b0 100644
--- a/examples/chat.c
+++ b/examples/chat.c
@@ -3,18 +3,20 @@
 #include <string.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) {
@@ -39,7 +41,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, meshlink_errstr);
+			fprintf(stderr, "Could not invite '%s': %s\n", arg, mesh->errstr);
 			return;
 		}
 
@@ -52,7 +54,7 @@ static void parse_command(meshlink_handle_t *mesh, char *buf) {
 		}
 
 		if(!meshlink_join(mesh, arg))
-			fprintf(stderr, "Could not join using invitation: %s\n", meshlink_errstr);
+			fprintf(stderr, "Could not join using invitation: %s\n", mesh->errstr);
 		else
 			fprintf(stderr, "Invitation accepted!\n");
 	} else if(!strcasecmp(buf, "kick")) {
@@ -129,7 +131,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, meshlink_errstr);
+		fprintf(stderr, "Could not send message to '%s': %s\n", destination->name, mesh->errstr);
 		return;
 	}
 
@@ -149,16 +151,16 @@ int main(int argc, char *argv[]) {
 
 	meshlink_handle_t *mesh = meshlink_open(confbase, nick);
 	if(!mesh) {
-		fprintf(stderr, "Could not open MeshLink: %s\n", meshlink_errstr);
+		fprintf(stderr, "Could not open MeshLink: %s\n", mesh->errstr);
 		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", meshlink_errstr);
+		fprintf(stderr, "Could not start MeshLink: %s\n", mesh->errstr);
 		return 1;
 	}