From 8582c3b5e0ee3f6b547dbaed7a1214819d3dfc91 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sat, 12 Jun 2021 23:23:16 +0200 Subject: [PATCH] Fix building the example programs. --- examples/channels.c | 58 +------------------------------ examples/chat.c | 38 -------------------- examples/chatpp.cc | 16 --------- examples/groupchat.c | 83 +------------------------------------------- examples/manynodes.c | 58 +------------------------------ 5 files changed, 3 insertions(+), 250 deletions(-) diff --git a/examples/channels.c b/examples/channels.c index 3a5426e..e067ba0 100644 --- a/examples/channels.c +++ b/examples/channels.c @@ -88,24 +88,7 @@ static void parse_command(meshlink_handle_t *mesh, char *buf) { *arg++ = 0; } - if(!strcasecmp(buf, "invite")) { - char *invitation; - - if(!arg) { - fprintf(stderr, "/invite requires an argument!\n"); - return; - } - - invitation = meshlink_invite(mesh, NULL, arg); - - if(!invitation) { - fprintf(stderr, "Could not invite '%s': %s\n", arg, meshlink_strerror(meshlink_errno)); - return; - } - - printf("Invitation for %s: %s\n", arg, invitation); - free(invitation); - } else if(!strcasecmp(buf, "join")) { + if(!strcasecmp(buf, "join")) { if(!arg) { fprintf(stderr, "/join requires an argument!\n"); return; @@ -123,44 +106,6 @@ static void parse_command(meshlink_handle_t *mesh, char *buf) { 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"); - 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_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); @@ -192,7 +137,6 @@ static void parse_command(meshlink_handle_t *mesh, char *buf) { printf( ": Send a message to the given node.\n" " Subsequent messages don't need the : prefix.\n" - "/invite Create an invitation for a new node.\n" "/join Join an existing mesh using an invitation.\n" "/kick Blacklist the given node.\n" "/who [] List all nodes or show information about the given node.\n" diff --git a/examples/chat.c b/examples/chat.c index 0df04a7..bf31709 100644 --- a/examples/chat.c +++ b/examples/chat.c @@ -69,44 +69,6 @@ static void parse_command(meshlink_handle_t *mesh, char *buf) { 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"); - 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_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); diff --git a/examples/chatpp.cc b/examples/chatpp.cc index 113d955..26ffde5 100644 --- a/examples/chatpp.cc +++ b/examples/chatpp.cc @@ -59,22 +59,6 @@ static void parse_command(meshlink::mesh *mesh, char *buf) { 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"); - return; - } - - meshlink::node *node = mesh->get_node(arg); - - if(!node) { - fprintf(stderr, "Error looking up '%s': %s\n", arg, meshlink::strerror()); - return; - } - - mesh->blacklist(node); - - printf("Node '%s' blacklisted.\n", arg); } else if(!strcasecmp(buf, "who")) { if(!arg) { nodes = mesh->get_all_nodes(nodes, &nnodes); diff --git a/examples/groupchat.c b/examples/groupchat.c index 5f03a61..ddcbbfa 100644 --- a/examples/groupchat.c +++ b/examples/groupchat.c @@ -95,48 +95,7 @@ static void parse_command(meshlink_handle_t *mesh, char *buf) { } - if(!strcasecmp(buf, "invite")) { - if(!arg) { - fprintf(stderr, "/invite requires an argument!\n"); - return; - } - - meshlink_submesh_t *s = NULL; - - if(arg1) { - size_t nmemb; - meshlink_submesh_t **submeshes = devtool_get_all_submeshes(mesh, NULL, &nmemb); - - if(!submeshes || !nmemb) { - fprintf(stderr, "Group does not exist!\n"); - return; - } - - for(size_t i = 0; i < nmemb; i++) { - if(!strcmp(arg1, submeshes[i]->name)) { - s = submeshes[i]; - break; - } - } - - free(submeshes); - - if(!s) { - fprintf(stderr, "Group is not yet created!\n"); - return; - } - } - - char *invitation = meshlink_invite(mesh, s, arg); - - if(!invitation) { - fprintf(stderr, "Could not invite '%s': %s\n", arg, meshlink_strerror(meshlink_errno)); - return; - } - - fprintf(stderr, "Invitation for %s: %s\n", arg, invitation); - free(invitation); - } else if(!strcasecmp(buf, "canonical")) { + if(!strcasecmp(buf, "canonical")) { bool set; char *host = NULL, *port = NULL; @@ -209,44 +168,6 @@ static void parse_command(meshlink_handle_t *mesh, char *buf) { 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"); - 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_blacklist(mesh, node)) { - fprintf(stderr, "Error blacklising '%s': %s", arg, meshlink_strerror(meshlink_errno)); - return; - } - - fprintf(stderr, "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; - } - - fprintf(stderr, "Node '%s' whitelisted.\n", arg); } else if(!strcasecmp(buf, "who")) { meshlink_submesh_t *node_group = NULL; @@ -344,8 +265,6 @@ static void parse_command(meshlink_handle_t *mesh, char *buf) { ": Send a message to the given node.\n" " Subsequent messages don't need the : prefix.\n" "/group Create a new group" - "/invite [submesh] Create an invitation for a new node.\n" - " Node joins either coremesh or submesh depending on submesh parameter.\n" "/join Join an existing mesh using an invitation.\n" "/kick Blacklist the given node.\n" "/who [] List all nodes or show information about the given node.\n" diff --git a/examples/manynodes.c b/examples/manynodes.c index 1fdb3b4..0ccf075 100644 --- a/examples/manynodes.c +++ b/examples/manynodes.c @@ -202,24 +202,7 @@ static void parse_command(char *buf) { *arg++ = 0; } - if(!strcasecmp(buf, "invite")) { - char *invitation; - - if(!arg) { - fprintf(stderr, "/invite requires an argument!\n"); - return; - } - - invitation = meshlink_invite(meshes[nodeindex], NULL, arg); - - if(!invitation) { - fprintf(stderr, "Could not invite '%s': %s\n", arg, meshlink_strerror(meshlink_errno)); - return; - } - - printf("Invitation for %s: %s\n", arg, invitation); - free(invitation); - } else if(!strcasecmp(buf, "join")) { + if(!strcasecmp(buf, "join")) { if(!arg) { fprintf(stderr, "/join requires an argument!\n"); return; @@ -237,44 +220,6 @@ static void parse_command(char *buf) { 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"); - return; - } - - meshlink_node_t *node = meshlink_get_node(meshes[nodeindex], arg); - - if(!node) { - fprintf(stderr, "Unknown node '%s'\n", arg); - return; - } - - if(!meshlink_blacklist(meshes[nodeindex], 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(meshes[nodeindex], arg); - - if(!node) { - fprintf(stderr, "Error looking up '%s': %s\n", arg, meshlink_strerror(meshlink_errno)); - return; - } - - if(!meshlink_whitelist(meshes[nodeindex], 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(meshes[nodeindex], nodes, &nnodes); @@ -326,7 +271,6 @@ static void parse_command(char *buf) { printf( ": Send a message to the given node.\n" " Subsequent messages don't need the : prefix.\n" - "/invite Create an invitation for a new node.\n" "/join Join an existing mesh using an invitation.\n" "/kick Blacklist the given node.\n" "/who [] List all nodes or show information about the given node.\n" -- 2.39.2