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

diff --git a/src/devtools.c b/src/devtools.c
index d4c00f13..6d22516d 100644
--- a/src/devtools.c
+++ b/src/devtools.c
@@ -185,7 +185,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);
@@ -237,3 +237,62 @@ 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);
+
+	status->options = internal->options;
+	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_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;
+}