X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdevtools.c;h=fab0c72019325ad4e893207305c2fc71abf81e94;hb=a5a8005b2d89712e124ab7295165a3e229abdad5;hp=6d22516d145c16b04e095610977f57bf4c7d55a3;hpb=6054182c9e208fd0b3f5c6c90f54cb5af75d3f5c;p=meshlink diff --git a/src/devtools.c b/src/devtools.c index 6d22516d..fab0c720 100644 --- a/src/devtools.c +++ b/src/devtools.c @@ -23,12 +23,25 @@ #include "logger.h" #include "meshlink_internal.h" #include "node.h" +#include "submesh.h" #include "splay_tree.h" #include "netutl.h" #include "xalloc.h" #include "devtools.h" +static void trybind_nop_probe(void) { + return; +} + +static void keyrotate_nop_probe(int stage) { + (void)stage; + return; +} + +void (*devtool_trybind_probe)(void) = trybind_nop_probe; +void (*devtool_keyrotate_probe)(int stage) = keyrotate_nop_probe; + /* Return an array of edges in the current network graph. * Data captures the current state and will not be updated. * Caller must deallocate data when done. @@ -39,7 +52,7 @@ devtool_edge_t *devtool_get_all_edges(meshlink_handle_t *mesh, devtool_edge_t *e return NULL; } - pthread_mutex_lock(&(mesh->mesh_mutex)); + pthread_mutex_lock(&mesh->mutex); devtool_edge_t *result = NULL; unsigned int result_size = 0; @@ -48,7 +61,7 @@ devtool_edge_t *devtool_get_all_edges(meshlink_handle_t *mesh, devtool_edge_t *e // if result is smaller than edges, we have to dealloc all the excess devtool_edge_t if((size_t)result_size > *nmemb) { - result = realloc(edges, result_size * sizeof(*result)); + result = xrealloc(edges, result_size * sizeof(*result)); } else { result = edges; } @@ -73,7 +86,6 @@ devtool_edge_t *devtool_get_all_edges(meshlink_handle_t *mesh, devtool_edge_t *e p->from = (meshlink_node_t *)e->from; p->to = (meshlink_node_t *)e->to; p->address = e->address.storage; - p->options = e->options; p->weight = e->weight; n++; @@ -81,19 +93,21 @@ devtool_edge_t *devtool_get_all_edges(meshlink_handle_t *mesh, devtool_edge_t *e } // shrink result to the actual amount of memory used - result = realloc(result, n * sizeof(*result)); + result = xrealloc(result, n * sizeof(*result)); *nmemb = n; } else { *nmemb = 0; meshlink_errno = MESHLINK_ENOMEM; } - pthread_mutex_unlock(&(mesh->mesh_mutex)); + pthread_mutex_unlock(&mesh->mutex); return result; } static bool fstrwrite(const char *str, FILE *stream) { + assert(stream); + size_t len = strlen(str); if(fwrite((void *)str, 1, len, stream) != len) { @@ -103,20 +117,12 @@ static bool fstrwrite(const char *str, FILE *stream) { return true; } -static const char *__itoa(int value) { - static char buffer[sizeof(int) * 8 + 1]; // not thread safe - - if(snprintf(buffer, sizeof(buffer), "%d", value) == -1) { - return ""; - } - - return buffer; -} - bool devtool_export_json_all_edges_state(meshlink_handle_t *mesh, FILE *stream) { + assert(stream); + bool result = true; - pthread_mutex_lock(&(mesh->mesh_mutex)); + pthread_mutex_lock(&mesh->mutex); // export edges and nodes size_t node_count = 0; @@ -139,6 +145,8 @@ bool devtool_export_json_all_edges_state(meshlink_handle_t *mesh, FILE *stream) goto fail; } + char buf[16]; + for(size_t i = 0; i < node_count; ++i) { if(!fstrwrite("\t\t\"", stream) || !fstrwrite(((node_t *)nodes[i])->name, stream) || !fstrwrite("\": {\n", stream)) { goto fail; @@ -148,11 +156,9 @@ bool devtool_export_json_all_edges_state(meshlink_handle_t *mesh, FILE *stream) goto fail; } - if(!fstrwrite("\t\t\t\"options\": ", stream) || !fstrwrite(__itoa(((node_t *)nodes[i])->options), stream) || !fstrwrite(",\n", stream)) { - goto fail; - } + snprintf(buf, sizeof(buf), "%d", ((node_t *)nodes[i])->devclass); - if(!fstrwrite("\t\t\t\"devclass\": ", stream) || !fstrwrite(__itoa(((node_t *)nodes[i])->devclass), stream) || !fstrwrite("\n", stream)) { + if(!fstrwrite("\t\t\t\"devclass\": ", stream) || !fstrwrite(buf, stream) || !fstrwrite("\n", stream)) { goto fail; } @@ -201,11 +207,9 @@ bool devtool_export_json_all_edges_state(meshlink_handle_t *mesh, FILE *stream) free(address); - if(!fstrwrite("\t\t\t\"options\": ", stream) || !fstrwrite(__itoa(edges[i].options), stream) || !fstrwrite(",\n", stream)) { - goto fail; - } + snprintf(buf, sizeof(buf), "%d", edges[i].weight); - if(!fstrwrite("\t\t\t\"weight\": ", stream) || !fstrwrite(__itoa(edges[i].weight), stream) || !fstrwrite("\n", stream)) { + if(!fstrwrite("\t\t\t\"weight\": ", stream) || !fstrwrite(buf, stream) || !fstrwrite("\n", stream)) { goto fail; } @@ -233,7 +237,7 @@ done: free(nodes); free(edges); - pthread_mutex_unlock(&(mesh->mesh_mutex)); + pthread_mutex_unlock(&mesh->mutex); return result; } @@ -246,9 +250,8 @@ void devtool_get_node_status(meshlink_handle_t *mesh, meshlink_node_t *node, dev node_t *internal = (node_t *)node; - pthread_mutex_lock(&mesh->mesh_mutex); + pthread_mutex_lock(&mesh->mutex); - status->options = internal->options; memcpy(&status->status, &internal->status, sizeof status->status); memcpy(&status->address, &internal->address, sizeof status->address); status->mtu = internal->mtu; @@ -277,7 +280,38 @@ void devtool_get_node_status(meshlink_handle_t *mesh, meshlink_node_t *node, dev status->udp_status = DEVTOOL_UDP_UNKNOWN; } - pthread_mutex_unlock(&mesh->mesh_mutex); + pthread_mutex_unlock(&mesh->mutex); +} + +meshlink_submesh_t **devtool_get_all_submeshes(meshlink_handle_t *mesh, meshlink_submesh_t **submeshes, size_t *nmemb) { + if(!mesh || !nmemb || (*nmemb && !submeshes)) { + meshlink_errno = MESHLINK_EINVAL; + return NULL; + } + + meshlink_submesh_t **result; + + //lock mesh->nodes + pthread_mutex_lock(&mesh->mutex); + + *nmemb = mesh->submeshes->count; + result = realloc(submeshes, *nmemb * sizeof(*submeshes)); + + if(result) { + meshlink_submesh_t **p = result; + + for list_each(submesh_t, s, mesh->submeshes) { + *p++ = (meshlink_submesh_t *)s; + } + } else { + *nmemb = 0; + free(submeshes); + meshlink_errno = MESHLINK_ENOMEM; + } + + pthread_mutex_unlock(&mesh->mutex); + + return result; } meshlink_handle_t *devtool_open_in_netns(const char *confbase, const char *name, const char *appname, dev_class_t devclass, int netns) {