Moved 12 static variables to the meshlink_handle_t handle. Correctly passing the...

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index db69e6fd99c6a3612e06064c7c969523258bad05..058dfc76c11c85560bc70b9b6121bbe273a8880a 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -27,6 +27,7 @@
 #include "logger.h"
 #include "meshlink.h"
 #include "sockaddr.h"
+#include "sptps.h"
 
 #define MAXSOCKETS 8    /* Probably overkill... */
 
@@ -96,6 +97,19 @@ struct meshlink_handle {
        int pinginterval;       /* seconds between pings */
        int pingtimeout;        /* seconds to wait for response */
        int maxtimeout;
+
+       char meshlink_conf[PATH_MAX];
+       char hosts_dir[PATH_MAX];
+       
+       int sock;
+       sptps_t sptps;
+       char cookie[18], hash[18];
+       char *data;
+       size_t thedatalen;
+       bool success;
+       char line[4096];
+       char buffer[4096];
+       size_t blen;
 };
 
 /// A handle for a MeshLink node.
@@ -104,12 +118,6 @@ struct meshlink_node {
        void *priv;
 };
 
-// This is a *temporary* global variable which will keep the compiler happy
-// while refactoring the code to get rid of global variables.
-// TODO: remove this when no other global variables remain.
-
-extern meshlink_handle_t *mesh;
-
 /// Header for data packets routed between nodes
 typedef struct meshlink_packethdr {
        uint8_t destination[16];