Avoid allocating packet buffers unnecessarily.

[meshlink] / src / devtools.c

diff --git a/src/devtools.c b/src/devtools.c
index f7d388cad90826cea6b683829cfd2cba926c3481..5a49e3a860296a66ad049bd7d238946424ef1b2d 100644 (file)
--- a/src/devtools.c
+++ b/src/devtools.c
@@ -30,11 +30,23 @@
 
 #include "devtools.h"
 
-static void nop_probe(void) {
+static void trybind_nop_probe(void) {
        return;
 }
 
-void (*devtool_trybind_probe)(void) = nop_probe;
+static void keyrotate_nop_probe(int stage) {
+       (void)stage;
+       return;
+}
+
+static void inviter_commits_first_nop_probe(bool stage) {
+       (void)stage;
+       return;
+}
+
+void (*devtool_trybind_probe)(void) = trybind_nop_probe;
+void (*devtool_keyrotate_probe)(int stage) = keyrotate_nop_probe;
+void (*devtool_set_inviter_commits_first)(bool inviter_commited_first) = inviter_commits_first_nop_probe;
 
 /* Return an array of edges in the current network graph.
  * Data captures the current state and will not be updated.
@@ -46,7 +58,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;
@@ -55,7 +67,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;
        }
@@ -66,7 +78,7 @@ devtool_edge_t *devtool_get_all_edges(meshlink_handle_t *mesh, devtool_edge_t *e
 
                for splay_each(edge_t, e, mesh->edges) {
                        // skip edges that do not represent a two-directional connection
-                       if((!e->reverse) || (e->reverse->to != e->from)) {
+                       if(!e->reverse || e->reverse->to != e->from) {
                                continue;
                        }
 
@@ -80,7 +92,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++;
@@ -88,19 +99,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) {
@@ -110,20 +123,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;
@@ -146,6 +151,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;
@@ -155,11 +162,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;
                }
 
@@ -208,11 +213,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;
                }
 
@@ -240,7 +243,7 @@ done:
        free(nodes);
        free(edges);
 
-       pthread_mutex_unlock(&(mesh->mesh_mutex));
+       pthread_mutex_unlock(&mesh->mutex);
 
        return result;
 }
@@ -253,9 +256,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;
@@ -284,7 +286,7 @@ 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) {
@@ -296,7 +298,7 @@ meshlink_submesh_t **devtool_get_all_submeshes(meshlink_handle_t *mesh, meshlink
        meshlink_submesh_t **result;
 
        //lock mesh->nodes
-       pthread_mutex_lock(&(mesh->mesh_mutex));
+       pthread_mutex_lock(&mesh->mutex);
 
        *nmemb = mesh->submeshes->count;
        result = realloc(submeshes, *nmemb * sizeof(*submeshes));
@@ -313,10 +315,11 @@ meshlink_submesh_t **devtool_get_all_submeshes(meshlink_handle_t *mesh, meshlink
                meshlink_errno = MESHLINK_ENOMEM;
        }
 
-       pthread_mutex_unlock(&(mesh->mesh_mutex));
+       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) {
        meshlink_open_params_t *params = meshlink_open_params_init(confbase, name, appname, devclass);
        params->netns = dup(netns);