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

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index af63cc20..c9c1eeaa 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -26,7 +26,11 @@
 #include "hash.h"
 #include "logger.h"
 #include "meshlink.h"
+#include "meshlink_queue.h"
 #include "sockaddr.h"
+#include "sptps.h"
+
+#include <pthread.h>
 
 #define MAXSOCKETS 8    /* Probably overkill... */
 
@@ -46,10 +50,18 @@ typedef enum proxytype_t {
 	PROXY_EXEC,
 } proxytype_t;
 
+typedef struct outpacketqueue {
+	meshlink_node_t *destination;
+	const void *data;
+	unsigned int len;
+} outpacketqueue_t;
+
 /// A handle for an instance of MeshLink.
 struct meshlink_handle {
-	char *confbase;
 	char *name;
+	void *priv;
+
+	char *confbase;
 
 	meshlink_receive_cb_t receive_cb;
 	meshlink_node_status_cb_t node_status_cb;
@@ -57,8 +69,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;
 
@@ -69,6 +86,11 @@ struct meshlink_handle {
 	struct list_t *connections;
 	struct list_t *outgoings;
 
+	meshlink_queue_t outpacketqueue;
+
+	struct splay_tree_t *past_request_tree;
+	timeout_t past_request_timeout;
+
 	int contradicting_add_edge;
 	int contradicting_del_edge;
 	int sleeptime;
@@ -92,7 +114,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 +135,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.
+/// 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);
 
-extern meshlink_handle_t *mesh;
 
 #endif // MESHLINK_INTERNAL_H