Move declaration of meshlink_send_from_queue() to meshlink_internal.h.

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 57c2a8f6fb6a45800b9ed3ccea23b84fbd881a84..8604acb64051ff928a5a7deb13d242b24e6956cb 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -24,8 +24,12 @@
 
 #include "event.h"
 #include "hash.h"
+#include "logger.h"
 #include "meshlink.h"
 #include "sockaddr.h"
+#include "sptps.h"
+
+#include <pthread.h>
 
 #define MAXSOCKETS 8    /* Probably overkill... */
 
@@ -56,8 +60,13 @@ struct meshlink_handle {
        meshlink_log_level_t log_level;
 
        pthread_t thread;
+       bool threadstarted;
+       pthread_mutex_t outpacketqueue_mutex;
+       pthread_mutex_t nodes_mutex;
+       event_loop_t loop;
        listen_socket_t listen_socket[MAXSOCKETS];
        int listen_sockets;
+       signal_t datafromapp;
 
        struct node_t *self;
 
@@ -68,6 +77,8 @@ struct meshlink_handle {
        struct list_t *connections;
        struct list_t *outgoings;
 
+       struct list_t *outpacketqueue;
+
        int contradicting_add_edge;
        int contradicting_del_edge;
        int sleeptime;
@@ -89,6 +100,21 @@ struct meshlink_handle {
        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.
@@ -97,10 +123,13 @@ 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.
+/// Header for data packets routed between nodes
+typedef struct meshlink_packethdr {
+       uint8_t destination[16];
+       uint8_t source[16];
+} __attribute__ ((__packed__)) meshlink_packethdr_t;
+
+extern void meshlink_send_from_queue(event_loop_t* el,meshlink_handle_t *mesh);
 
-extern meshlink_handle_t *mesh;
 
 #endif // MESHLINK_INTERNAL_H