devtools.h must not rely on internal types.

diff --git a/src/devtools.c b/src/devtools.c
index a1921d8b234ed04901349aa81a536e864a50db32..3f2c0a4942797ff24d931ffccdec65fcdac6d043 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;

diff --git a/src/devtools.h b/src/devtools.h
index a9badbc5149b234416f9ef2bcaab99bea01b61da..e74d41376b7a0644b4cba2e235fc08521b66ef20 100644 (file)
--- a/src/devtools.h
+++ b/src/devtools.h
@@ -89,7 +89,7 @@ typedef struct devtool_node_status devtool_node_status_t;
 struct devtool_node_status {
        uint32_t options;
        uint32_t status;
-       sockaddr_t address;
+       struct sockaddr_storage address;
        uint16_t mtu;
        uint16_t minmtu;
        uint16_t maxmtu;