Move code from libmeshlink.c into the new functions in meshlink.c.

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index c21608fe344f562dcb02e07153acded3eb805d25..1e4964241a9a36ee02079ee02462a981efd99e6f 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -23,7 +23,28 @@
 #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 {
@@ -36,7 +57,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;
 
@@ -53,6 +75,23 @@ struct meshlink_handle {
        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;
 };
 
 /// A handle for a MeshLink node.
@@ -67,4 +106,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