X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=52137efb51ca7915d2fc17341dd8c18bf20dbaff;hb=8bb44d97e49251dbf4c8d6b66956b91c7d2144cf;hp=db69e6fd99c6a3612e06064c7c969523258bad05;hpb=93f89bcae11e8d250831896bc5694ee8bd2ad22b;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index db69e6fd..52137efb 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -27,9 +27,17 @@
 #include "logger.h"
 #include "meshlink.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;
@@ -46,10 +54,18 @@ typedef enum proxytype_t {
 	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;
+	void *priv;
+
+	char *confbase;
 
 	meshlink_receive_cb_t receive_cb;
 	meshlink_node_status_cb_t node_status_cb;
@@ -57,9 +73,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;
 
@@ -70,6 +90,11 @@ struct meshlink_handle {
 	struct list_t *connections;
 	struct list_t *outgoings;
 
+	struct list_t *outpacketqueue;
+
+	struct splay_tree_t *past_request_tree;
+	timeout_t past_request_timeout;
+
 	int contradicting_add_edge;
 	int contradicting_del_edge;
 	int sleeptime;
@@ -96,6 +121,23 @@ struct meshlink_handle {
 	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;
 };
 
 /// A handle for a MeshLink node.
@@ -104,16 +146,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.
-
-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;
 
+extern void meshlink_send_from_queue(event_loop_t* el,meshlink_handle_t *mesh);
+
+
 #endif // MESHLINK_INTERNAL_H