X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=db69e6fd99c6a3612e06064c7c969523258bad05;hb=93f89bcae11e8d250831896bc5694ee8bd2ad22b;hp=321a1f356500637de994819550517657931b691c;hpb=5a7627ddb41361847ce39be96dafedcb3c87f27c;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 321a1f35..db69e6fd 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -22,11 +22,29 @@
 
 #include "system.h"
 
-#include "node.h"
+#include "event.h"
+#include "hash.h"
+#include "logger.h"
 #include "meshlink.h"
-#include "splay_tree.h"
+#include "sockaddr.h"
 
-#define MAXSOCKETS 16
+#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 {
@@ -39,15 +57,45 @@ struct meshlink_handle {
 	meshlink_log_level_t log_level;
 
 	pthread_t thread;
+	event_loop_t loop;
 	listen_socket_t listen_socket[MAXSOCKETS];
+	int listen_sockets;
+
+	struct node_t *self;
+
+	struct splay_tree_t *config;
+	struct splay_tree_t *edges;
+	struct splay_tree_t *nodes;
+
+	struct list_t *connections;
+	struct list_t *outgoings;
+
+	int contradicting_add_edge;
+	int contradicting_del_edge;
+	int sleeptime;
+	time_t last_config_check;
+	timeout_t pingtimer;
+	timeout_t periodictimer;
 
-	node_t *myself;
+	char *myport;
 
-	splay_tree_t *config;
-	splay_tree_t *edges;
-	splay_tree_t *nodes;
+	char *proxyhost;
+	char *proxyport;
+	char *proxyuser;
+	char *proxypass;
+	proxytype_t proxytype;
 
-	list_t *outgoing_connections;
+	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;
 };
 
 /// A handle for a MeshLink node.
@@ -56,4 +104,16 @@ 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