#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;
+}
+
+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.
// 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;
}
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++;
}
// 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;
}
static bool fstrwrite(const char *str, FILE *stream) {
+ assert(stream);
+
size_t len = strlen(str);
if(fwrite((void *)str, 1, len, stream) != len) {
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));
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;
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;
}
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;
}
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;
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);