Restart the mesh after a failed join() in the other examples as well.

[meshlink] / examples / chatpp.cc

diff --git a/examples/chatpp.cc b/examples/chatpp.cc
index 608367a9c432f6fd6aeaa1ca6841db1cdb13d20f..97f8740639836591beabb294b8b5c851df1e0a5e 100644 (file)
--- a/examples/chatpp.cc
+++ b/examples/chatpp.cc
@@ -4,28 +4,32 @@
 #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);
-}
-
-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);
-}
+       void node_status(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;
@@ -57,10 +61,17 @@ static void parse_command(meshlink::mesh *mesh, char *buf) {
                        return;
                }
 
+               mesh->stop();
+
                if(!mesh->join(arg))
                        fprintf(stderr, "Could not join using invitation: %s\n", meshlink::strerror());
                else
                        fprintf(stderr, "Invitation accepted!\n");
+
+               if(!mesh->start()) {
+                       fprintf(stderr, "Could not restart MeshLink: %s\n", meshlink::strerror());
+                       exit(1);
+               }
        } else if(!strcasecmp(buf, "kick")) {
                if(!arg) {
                        fprintf(stderr, "/kick requires an argument!\n");
@@ -82,7 +93,7 @@ static void parse_command(meshlink::mesh *mesh, char *buf) {
                        if(!nodes) {
                                fprintf(stderr, "Could not get list of nodes: %s\n", meshlink::strerror());
                        } else {
-                               printf("%d known nodes:", nnodes);
+                               printf("%zu known nodes:", nnodes);
                                for(size_t i = 0; i < nnodes; i++)
                                        printf(" %s", nodes[i]->name);
                                printf("\n");
@@ -171,6 +182,7 @@ static void parse_input(meshlink::mesh *mesh, char *buf) {
        printf("Message sent to '%s'.\n", destination->name);
 }
 
+
 int main(int argc, char *argv[]) {
        const char *confbase = ".chat";
        const char *nick = NULL;
@@ -182,17 +194,15 @@ int main(int argc, char *argv[]) {
        if(argc > 2)
                nick = argv[2];
 
-       meshlink::mesh *mesh = meshlink::open(confbase, nick, "chatpp");
-       if(!mesh) {
+       ChatMesh mesh;
+       mesh.open(confbase, nick, "chatpp", DEV_CLASS_STATIONARY);
+
+       if(!mesh.isOpen()) {
                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()) {
+       if(!mesh.start()) {
                fprintf(stderr, "Could not start MeshLink: %s\n", meshlink::strerror());
                return 1;
        }
@@ -200,12 +210,12 @@ int main(int argc, char *argv[]) {
        printf("Chat started.\nType /help for a list of commands.\n");
 
        while(fgets(buf, sizeof buf, stdin))
-               parse_input(mesh, buf);
+               parse_input(&mesh, buf);
 
        printf("Chat stopping.\n");
 
-       mesh->stop();
-       meshlink::close(mesh);
+       mesh.stop();
+       mesh.close();
 
        return 0;
 }