X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmeshlink_internal.h;h=8604acb64051ff928a5a7deb13d242b24e6956cb;hb=1815910fc7409ffea2b386196c4d12af12578f42;hp=db69e6fd99c6a3612e06064c7c969523258bad05;hpb=93f89bcae11e8d250831896bc5694ee8bd2ad22b;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index db69e6fd..8604acb6 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,9 +60,13 @@ struct meshlink_handle {
 	meshlink_log_level_t log_level;
 
 	pthread_t thread;
+	bool threadstarted;
+	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;
 
@@ -70,6 +77,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;
@@ -96,6 +105,16 @@ struct meshlink_handle {
 	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.
@@ -104,16 +123,13 @@ 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;
 
+extern void meshlink_send_from_queue(event_loop_t* el,meshlink_handle_t *mesh);
+
+
 #endif // MESHLINK_INTERNAL_H