X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fdevtools.c;h=0284dcd5abe08a68c78ebc3a34d5cff723164085;hp=d4c00f139013fa1e0e69aa4d6bf173afc372cafb;hb=f31267783fccb4e17d914c64243b0cba4e5632c4;hpb=b67296418c51784d39a24c3041e2cb199bee06f2

diff --git a/src/devtools.c b/src/devtools.c
index d4c00f13..0284dcd5 100644
--- a/src/devtools.c
+++ b/src/devtools.c
@@ -23,12 +23,25 @@
 #include "logger.h"
 #include "meshlink_internal.h"
 #include "node.h"
+#include "submesh.h"
 #include "splay_tree.h"
 #include "netutl.h"
 #include "xalloc.h"
 
 #include "devtools.h"
 
+static void trybind_nop_probe(void) {
+	return;
+}
+
+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.
  * Caller must deallocate data when done.
@@ -48,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;
 	}
@@ -73,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++;
@@ -81,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;
@@ -94,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) {
@@ -103,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));
@@ -139,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;
@@ -148,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;
 		}
 
@@ -185,7 +191,7 @@ bool devtool_export_json_all_edges_state(meshlink_handle_t *mesh, FILE *stream)
 		}
 
 		char *host = NULL, *port = NULL, *address = NULL;
-		sockaddr2str((const sockaddr_t *) & (edges[i].address), &host, &port);
+		sockaddr2str((const sockaddr_t *)&edges[i].address, &host, &port);
 
 		if(host && port) {
 			xasprintf(&address, "{ \"host\": \"%s\", \"port\": %s }", host, port);
@@ -201,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;
 		}
 
@@ -237,3 +241,92 @@ done:
 
 	return result;
 }
+
+void devtool_get_node_status(meshlink_handle_t *mesh, meshlink_node_t *node, devtool_node_status_t *status) {
+	if(!mesh || !node || !status) {
+		meshlink_errno = MESHLINK_EINVAL;
+		return;
+	}
+
+	node_t *internal = (node_t *)node;
+
+	pthread_mutex_lock(&mesh->mesh_mutex);
+
+	memcpy(&status->status, &internal->status, sizeof status->status);
+	memcpy(&status->address, &internal->address, sizeof status->address);
+	status->mtu = internal->mtu;
+	status->minmtu = internal->minmtu;
+	status->maxmtu = internal->maxmtu;
+	status->mtuprobes = internal->mtuprobes;
+	status->in_packets = internal->in_packets;
+	status->in_bytes = internal->in_bytes;
+	status->out_packets = internal->out_packets;
+	status->out_bytes = internal->out_bytes;
+
+	// Derive UDP connection status
+	if(internal == mesh->self) {
+		status->udp_status = DEVTOOL_UDP_WORKING;
+	} else if(!internal->status.reachable) {
+		status->udp_status = DEVTOOL_UDP_IMPOSSIBLE;
+	} else if(!internal->status.validkey) {
+		status->udp_status = DEVTOOL_UDP_UNKNOWN;
+	} else if(internal->status.udp_confirmed) {
+		status->udp_status = DEVTOOL_UDP_WORKING;
+	} else if(internal->mtuprobes > 30) {
+		status->udp_status = DEVTOOL_UDP_FAILED;
+	} else if(internal->mtuprobes > 0) {
+		status->udp_status = DEVTOOL_UDP_TRYING;
+	} else {
+		status->udp_status = DEVTOOL_UDP_UNKNOWN;
+	}
+
+	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);
+	meshlink_handle_t *handle;
+
+	if(params->netns == -1) {
+		handle = NULL;
+		meshlink_errno = MESHLINK_EINVAL;
+	} else {
+		handle = meshlink_open_ex(params);
+	}
+
+	meshlink_open_params_free(params);
+
+	return handle;
+}