Remove global variables from the event loop code.

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 04db92fcb2ceaa5f47cacaa7252c5780e1f58ae2..db69e6fd99c6a3612e06064c7c969523258bad05 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -22,7 +22,29 @@
 
 #include "system.h"
 
+#include "event.h"
+#include "hash.h"
+#include "logger.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 +57,9 @@ struct meshlink_handle {
        meshlink_log_level_t log_level;
 
        pthread_t thread;
-       struct list_t *sockets;
+       event_loop_t loop;
+       listen_socket_t listen_socket[MAXSOCKETS];
+       int listen_sockets;
 
        struct node_t *self;
 
@@ -45,6 +69,33 @@ struct meshlink_handle {
 
        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;
+
+       debug_t debug_level;
+       int pinginterval;       /* seconds between pings */
+       int pingtimeout;        /* seconds to wait for response */
+       int maxtimeout;
 };
 
 /// A handle for a MeshLink node.
@@ -59,4 +110,10 @@ struct meshlink_node {
 
 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