X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=994f25bf9bd5f077403ffc67ec5f484ce6165d50;hb=eea70edd68ff954c35f8d26ac8eb01d4bf3921d9;hp=d4ab46cafc1da8dba6ae83d789252b3d438397a2;hpb=e0625111fbd75da6a5bbf8284577b0bc7f56b2b6;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index d4ab46ca..994f25bf 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -24,8 +24,8 @@
 
 #include "event.h"
 #include "hash.h"
-#include "logger.h"
 #include "meshlink.h"
+#include "meshlink_queue.h"
 #include "sockaddr.h"
 #include "sptps.h"
 
@@ -62,8 +62,12 @@ typedef struct outpacketqueue {
 
 /// 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;
@@ -73,7 +77,7 @@ struct meshlink_handle {
 	pthread_t thread;
 	bool threadstarted;
 	pthread_mutex_t outpacketqueue_mutex;
-	pthread_mutex_t nodes_mutex;
+	pthread_mutex_t mesh_mutex;
 	event_loop_t loop;
 	listen_socket_t listen_socket[MAXSOCKETS];
 	int listen_sockets;
@@ -88,7 +92,7 @@ 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;
@@ -115,7 +119,6 @@ struct meshlink_handle {
 	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;
@@ -136,6 +139,7 @@ struct meshlink_handle {
 	struct AvahiSServiceBrowser *avahi_browser;
 	struct AvahiSimplePoll *avahi_poll;
 	struct AvahiSEntryGroup *avahi_group;
+	char* avahi_servicetype;
 };
 
 /// A handle for a MeshLink node.
@@ -151,6 +155,16 @@ typedef struct meshlink_packethdr {
 } __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