Immediately try connecting to the mesh after a succesful join.

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 6426f83dcbce397df1065899a421a99ffa09b557..7976a55a7bb21a6be21c683b0e8b317df9dce895 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -23,8 +23,20 @@
 #include "system.h"
 
 #include "event.h"
+#include "hash.h"
+#include "logger.h"
 #include "meshlink.h"
 #include "sockaddr.h"
+#include "sptps.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,
@@ -46,7 +58,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;
 
@@ -74,6 +88,25 @@ struct meshlink_handle {
 
        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.
@@ -82,10 +115,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