X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=517dc1e01cb8dbee31824f040f7c0a6140015f9e;hb=01eaeb3c9fa60ae9c6e5b866acd9baef79622d99;hp=52137efb51ca7915d2fc17341dd8c18bf20dbaff;hpb=efbdf1564bb6a8f17ca28e61ccc6a507f1159994;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 52137efb..517dc1e0 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"
 
@@ -63,6 +63,8 @@ typedef struct outpacketqueue {
 /// A handle for an instance of MeshLink.
 struct meshlink_handle {
 	char *name;
+	char *appname;
+	dev_class_t devclass;
 	void *priv;
 
 	char *confbase;
@@ -72,10 +74,12 @@ struct meshlink_handle {
 	meshlink_log_cb_t log_cb;
 	meshlink_log_level_t log_level;
 
+	meshlink_channel_accept_cb_t channel_accept_cb;
+
 	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;
@@ -90,7 +94,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;
@@ -117,7 +121,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;
@@ -138,6 +141,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.
@@ -146,6 +150,13 @@ struct meshlink_node {
 	void *priv;
 };
 
+/// A channel.
+struct meshlink_channel {
+	struct utcp_connection *c;
+	struct node_t *node;
+	meshlink_channel_receive_cb_t receive_cb;
+};
+
 /// Header for data packets routed between nodes
 typedef struct meshlink_packethdr {
 	uint8_t destination[16];
@@ -153,6 +164,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