X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=cb60416d838d02eb6eb5efa351cfbee8eaead149;hb=62031be5f0a4b7e37a99cce43d0a77a67690e791;hp=af63cc2093969b8a719c370920dacee047017966;hpb=2c424175639d62ea806b79173dfe6f554cf3ceb9;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index af63cc20..cb60416d 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -27,6 +27,9 @@
 #include "logger.h"
 #include "meshlink.h"
 #include "sockaddr.h"
+#include "sptps.h"
+
+#include <pthread.h>
 
 #define MAXSOCKETS 8    /* Probably overkill... */
 
@@ -57,8 +60,12 @@ struct meshlink_handle {
 	meshlink_log_level_t log_level;
 
 	pthread_t thread;
+	pthread_mutex_t outpacketqueue_mutex;
+	pthread_mutex_t nodes_mutex;
+	event_loop_t loop;
 	listen_socket_t listen_socket[MAXSOCKETS];
 	int listen_sockets;
+	signal_t datafromapp;
 
 	struct node_t *self;
 
@@ -69,6 +76,8 @@ struct meshlink_handle {
 	struct list_t *connections;
 	struct list_t *outgoings;
 
+	struct list_t *outpacketqueue;
+
 	int contradicting_add_edge;
 	int contradicting_del_edge;
 	int sleeptime;
@@ -92,7 +101,19 @@ struct meshlink_handle {
 	struct ecdsa *invitation_key;
 
 	debug_t debug_level;
-	bool bypass_security;
+	int pinginterval;	/* seconds between pings */
+	int pingtimeout;	/* seconds to wait for response */
+	int maxtimeout;
+
+	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.
@@ -101,10 +122,10 @@ 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];
+	uint8_t source[16];
+} __attribute__ ((__packed__)) meshlink_packethdr_t;
 
 #endif // MESHLINK_INTERNAL_H