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

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index fc40f301..cb60416d 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -22,7 +22,32 @@
 
 #include "system.h"
 
+#include "event.h"
+#include "hash.h"
+#include "logger.h"
 #include "meshlink.h"
+#include "sockaddr.h"
+#include "sptps.h"
+
+#include <pthread.h>
+
+#define MAXSOCKETS 8    /* Probably overkill... */
+
+typedef struct listen_socket_t {
+	struct io_t tcp;
+	struct io_t udp;
+	sockaddr_t sa;
+	bool bindto;
+} listen_socket_t;
+
+typedef enum proxytype_t {
+	PROXY_NONE = 0,
+	PROXY_SOCKS4,
+	PROXY_SOCKS4A,
+	PROXY_SOCKS5,
+	PROXY_HTTP,
+	PROXY_EXEC,
+} proxytype_t;
 
 /// A handle for an instance of MeshLink.
 struct meshlink_handle {
@@ -35,7 +60,12 @@ struct meshlink_handle {
 	meshlink_log_level_t log_level;
 
 	pthread_t thread;
-	struct list_t *sockets;
+	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;
 
@@ -44,7 +74,46 @@ struct meshlink_handle {
 	struct splay_tree_t *nodes;
 
 	struct list_t *connections;
-	struct list_t *outgoing_connections;
+	struct list_t *outgoings;
+
+	struct list_t *outpacketqueue;
+
+	int contradicting_add_edge;
+	int contradicting_del_edge;
+	int sleeptime;
+	time_t last_config_check;
+	timeout_t pingtimer;
+	timeout_t periodictimer;
+
+	char *myport;
+
+	char *proxyhost;
+	char *proxyport;
+	char *proxyuser;
+	char *proxypass;
+	proxytype_t proxytype;
+
+	bool localdiscovery;
+	sockaddr_t localdiscovery_address;
+
+	hash_t *node_udp_cache;
+	struct connection_t *everyone;
+	struct ecdsa *invitation_key;
+
+	debug_t debug_level;
+	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.
@@ -53,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