Ignore online/offline state from Catta.

[meshlink] / src / devtools.c

diff --git a/src/devtools.c b/src/devtools.c
index 2aba935b07e14a8563bbd8b220457f34c74007c9..cd45e39ff61e6a19047aae023e0ee19b964ea9d1 100644 (file)
--- a/src/devtools.c
+++ b/src/devtools.c
@@ -30,12 +30,17 @@
 
 #include "devtools.h"
 
-static void nop_probe(void) {
+static void trybind_nop_probe(void) {
        return;
 }
 
-void (*devtool_trybind_probe)(void) = nop_probe;
-void (*devtool_keyrotate_probe)(int stage) = nop_probe;
+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.
@@ -81,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++;
@@ -156,10 +160,6 @@ 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;
-               }
-
                if(!fstrwrite("\t\t\t\"devclass\": ", stream) || !fstrwrite(__itoa(((node_t *)nodes[i])->devclass), stream) || !fstrwrite("\n", stream)) {
                        goto fail;
                }
@@ -209,10 +209,6 @@ 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;
-               }
-
                if(!fstrwrite("\t\t\t\"weight\": ", stream) || !fstrwrite(__itoa(edges[i].weight), stream) || !fstrwrite("\n", stream)) {
                        goto fail;
                }
@@ -256,7 +252,6 @@ void devtool_get_node_status(meshlink_handle_t *mesh, meshlink_node_t *node, dev
 
        pthread_mutex_lock(&mesh->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;