Provide a way to open MeshLink in its own network namespace.

[meshlink] / src / devtools.c

diff --git a/src/devtools.c b/src/devtools.c
index a1921d8b234ed04901349aa81a536e864a50db32..6d22516d145c16b04e095610977f57bf4c7d55a3 100644 (file)
--- 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);
@@ -250,7 +250,7 @@ void devtool_get_node_status(meshlink_handle_t *mesh, meshlink_node_t *node, dev
 
        status->options = internal->options;
        memcpy(&status->status, &internal->status, sizeof status->status);
-       status->address = internal->address;
+       memcpy(&status->address, &internal->address, sizeof status->address);
        status->mtu = internal->mtu;
        status->minmtu = internal->minmtu;
        status->maxmtu = internal->maxmtu;
@@ -279,3 +279,20 @@ void devtool_get_node_status(meshlink_handle_t *mesh, meshlink_node_t *node, dev
 
        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;
+}