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)
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", meshlink_strerror(meshlink_errno));
- else
+ else {
fprintf(stderr, "Invitation accepted!\n");
+ if(!meshlink_start(mesh)) {
+ fprintf(stderr, "Could not start MeshLink: %s\n", meshlink_strerror(meshlink_errno));
+ return 1;
+ }
+ }
} else if(!strcasecmp(buf, "kick")) {
if(!arg) {
fprintf(stderr, "/kick requires an argument!\n");
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;
}
printf("Node '%s' blacklisted.\n", arg);
} else if(!strcasecmp(buf, "who")) {
if(!arg) {
- meshlink_node_t *nodes[100];
- size_t n = meshlink_get_all_nodes(mesh, nodes, 100);
- if(!n) {
- fprintf(stderr, "No nodes known!\n");
+ 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("Known nodes:");
- for(int i = 0; i < n && i < 100; i++)
+ printf("%zu known nodes:", nnodes);
+ for(int i = 0; i < nnodes; i++)
printf(" %s", nodes[i]->name);
- if(n > 100)
- printf(" (and %zu more)", n - 100);
printf("\n");
}
} else {
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));
} else {
printf("Node %s found\n", arg);
}
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;
}
}
meshlink_handle_t *mesh = meshlink_open(confbase, nick);
if(!mesh) {
- fprintf(stderr, "Could not open MeshLink!\n");
+ fprintf(stderr, "Could not open MeshLink: %s\n", meshlink_strerror(meshlink_errno));
return 1;
}