X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fdevtools.c;h=0284dcd5abe08a68c78ebc3a34d5cff723164085;hb=46e373d99b4559245885c94930a6979d03a6f12b;hp=2aba935b07e14a8563bbd8b220457f34c74007c9;hpb=3be622ad230c70e9753f9f9737333a2f803b125e;p=meshlink

diff --git a/src/devtools.c b/src/devtools.c
index 2aba935b..0284dcd5 100644
--- 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.
@@ -56,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;
 	}
@@ -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++;
@@ -89,7 +93,7 @@ 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;
@@ -102,6 +106,8 @@ devtool_edge_t *devtool_get_all_edges(meshlink_handle_t *mesh, devtool_edge_t *e
 }
 
 static bool fstrwrite(const char *str, FILE *stream) {
+	assert(stream);
+
 	size_t len = strlen(str);
 
 	if(fwrite((void *)str, 1, len, stream) != len) {
@@ -111,17 +117,9 @@ 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));
@@ -147,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;
@@ -156,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;
 		}
 
@@ -209,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;
 		}
 
@@ -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;
@@ -318,6 +313,7 @@ meshlink_submesh_t **devtool_get_all_submeshes(meshlink_handle_t *mesh, meshlink
 
 	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);