From: lakshminarayanagurram Date: Mon, 25 Feb 2019 10:01:38 +0000 (+0100) Subject: Add devtool_get_all_submeshes(). X-Git-Url: http://git.meshlink.io/?p=meshlink;a=commitdiff_plain;h=556532a450e55746e0f5c1c580d109b2744566da Add devtool_get_all_submeshes(). --- diff --git a/src/devtools.c b/src/devtools.c index 6d22516d..6d78119c 100644 --- a/src/devtools.c +++ b/src/devtools.c @@ -23,6 +23,7 @@ #include "logger.h" #include "meshlink_internal.h" #include "node.h" +#include "submesh.h" #include "splay_tree.h" #include "netutl.h" #include "xalloc.h" @@ -280,6 +281,36 @@ void devtool_get_node_status(meshlink_handle_t *mesh, meshlink_node_t *node, dev pthread_mutex_unlock(&mesh->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->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->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) { meshlink_open_params_t *params = meshlink_open_params_init(confbase, name, appname, devclass); params->netns = dup(netns); diff --git a/src/devtools.h b/src/devtools.h index 92862632..3c5f9433 100644 --- a/src/devtools.h +++ b/src/devtools.h @@ -120,6 +120,20 @@ struct devtool_node_status { */ extern void devtool_get_node_status(meshlink_handle_t *mesh, meshlink_node_t *node, devtool_node_status_t *status); +/// Get the list of all submeshes of a meshlink instance. +/** This function returns an array of submesh handles. + * These pointers are the same pointers that are present in the submeshes list + * in mesh handle. + * + * @param mesh A handle which represents an instance of MeshLink. + * @param submeshes A pointer to an array of submesh handles if any allocated previously. + * @param nmemb A pointer to a size_t variable that has + * to be provided by the caller. + * The contents of this variable will be changed to indicate + * the number if array elements. + */ +extern meshlink_submesh_t **devtool_get_all_submeshes(meshlink_handle_t *mesh, meshlink_submesh_t **submeshes, size_t *nmemb); + /// Open a MeshLink instance in a given network namespace. /** This function opens MeshLink in the given network namespace. *