Merge branch 'mesh_topology_output' into roles

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index fa1017d065538efe9634d26426aeb8e95609c6b7..994f25bf9bd5f077403ffc67ec5f484ce6165d50 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -22,12 +22,52 @@
 
 #include "system.h"
 
+#include "event.h"
+#include "hash.h"
 #include "meshlink.h"
+#include "meshlink_queue.h"
+#include "sockaddr.h"
+#include "sptps.h"
+
+#include <pthread.h>
+
+#define MAXSOCKETS 8    /* Probably overkill... */
+
+struct AvahiServer;
+struct AvahiSServiceBrowser;
+struct AvahiSimplePoll;
+struct AvahiSEntryGroup;
+
+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;
+
+typedef struct outpacketqueue {
+       meshlink_node_t *destination;
+       const void *data;
+       unsigned int len;
+} outpacketqueue_t;
 
 /// A handle for an instance of MeshLink.
 struct meshlink_handle {
-       char *confbase;
        char *name;
+       char *appname;
+       dev_class_t devclass;
+       void *priv;
+
+       char *confbase;
 
        meshlink_receive_cb_t receive_cb;
        meshlink_node_status_cb_t node_status_cb;
@@ -35,7 +75,13 @@ struct meshlink_handle {
        meshlink_log_level_t log_level;
 
        pthread_t thread;
-       struct list_t *sockets;
+       bool threadstarted;
+       pthread_mutex_t outpacketqueue_mutex;
+       pthread_mutex_t mesh_mutex;
+       event_loop_t loop;
+       listen_socket_t listen_socket[MAXSOCKETS];
+       int listen_sockets;
+       signal_t datafromapp;
 
        struct node_t *self;
 
@@ -43,7 +89,57 @@ 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;
+
+       meshlink_queue_t outpacketqueue;
+
+       struct splay_tree_t *past_request_tree;
+       timeout_t past_request_timeout;
+
+       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;
+
+       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;
+
+       pthread_t discovery_thread;
+       bool discovery_threadstarted;
+       struct AvahiServer *avahi_server;
+       struct AvahiSServiceBrowser *avahi_browser;
+       struct AvahiSimplePoll *avahi_poll;
+       struct AvahiSEntryGroup *avahi_group;
+       char* avahi_servicetype;
 };
 
 /// A handle for a MeshLink node.
@@ -52,4 +148,23 @@ struct meshlink_node {
        void *priv;
 };
 
+/// 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_log_level_t global_log_level;
+extern meshlink_log_cb_t global_log_cb;
+
+/// Device class traits
+typedef struct {
+       unsigned int min_connects;
+       unsigned int max_connects;
+       int edge_weight;
+} dev_class_traits_t;
+
+extern dev_class_traits_t dev_class_traits[];
+
 #endif // MESHLINK_INTERNAL_H