Move node_udp_cache, everyone and invitation_key to mesh.

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index a41fa09bbc78895e06d512371cbf6c3ab9f5edff..57c2a8f6fb6a45800b9ed3ccea23b84fbd881a84 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -22,7 +22,28 @@
 
 #include "system.h"
 
+#include "event.h"
+#include "hash.h"
 #include "meshlink.h"
+#include "sockaddr.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 +56,8 @@ struct meshlink_handle {
        meshlink_log_level_t log_level;
 
        pthread_t thread;
-       struct list_t *sockets;
+       listen_socket_t listen_socket[MAXSOCKETS];
+       int listen_sockets;
 
        struct node_t *self;
 
@@ -43,7 +65,30 @@ struct meshlink_handle {
        struct splay_tree_t *edges;
        struct splay_tree_t *nodes;
 
-       struct list_t *outgoing_connections;
+       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;
+
+       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;
 };
 
 /// A handle for a MeshLink node.