X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=6b47481f879e972fb4a83f5d801fe9b985cd2382;hb=733ef19ab996933c361f5b4f65fd768148a2d07b;hp=c58c477388620198143136e6603e274cbc129a3f;hpb=af8787d1b921fd2e286514ebe83ee1c7b449f298;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index c58c4773..6b47481f 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -26,6 +26,7 @@
 #include "hash.h"
 #include "logger.h"
 #include "meshlink.h"
+#include "meshlink_queue.h"
 #include "sockaddr.h"
 #include "sptps.h"
 
@@ -33,6 +34,11 @@
 
 #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;
@@ -49,10 +55,20 @@ 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;
+
+	char *appname;
 
 	meshlink_receive_cb_t receive_cb;
 	meshlink_node_status_cb_t node_status_cb;
@@ -60,7 +76,9 @@ 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;
@@ -75,7 +93,10 @@ struct meshlink_handle {
 	struct list_t *connections;
 	struct list_t *outgoings;
 
-	struct list_t *outpacketqueue;
+	meshlink_queue_t outpacketqueue;
+
+	struct splay_tree_t *past_request_tree;
+	timeout_t past_request_timeout;
 
 	int contradicting_add_edge;
 	int contradicting_del_edge;
@@ -113,6 +134,14 @@ struct meshlink_handle {
 	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.
@@ -127,4 +156,7 @@ typedef struct meshlink_packethdr {
 	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