X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=9abe19e0a20a3e65f4deee53fcfbaa3b2a34274d;hb=82e6ef764b4f1d2c2b6c1be35452cb87aff11350;hp=7c3a7d4c9734faff9a7e7684857f66c41f5a5270;hpb=0a1779867fc4b742979d8c84a429c6b8113c4eae;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 7c3a7d4c..9abe19e0 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"
 
@@ -33,6 +33,11 @@
 
 #define MAXSOCKETS 8    /* Probably overkill... */
 
+struct CattaServer;
+struct CattaSServiceBrowser;
+struct CattaSimplePoll;
+struct CattaSEntryGroup;
+
 typedef struct listen_socket_t {
 	struct io_t tcp;
 	struct io_t udp;
@@ -49,26 +54,27 @@ 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 *appname;
+	dev_class_t devclass;
+
+	char *confbase;
 
 	meshlink_receive_cb_t receive_cb;
 	meshlink_node_status_cb_t node_status_cb;
 	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;
@@ -83,7 +89,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;
@@ -106,11 +112,12 @@ struct meshlink_handle {
 	bool localdiscovery;
 	sockaddr_t localdiscovery_address;
 
+	bool default_blacklist;
+
 	hash_t *node_udp_cache;
 	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;
@@ -124,6 +131,14 @@ struct meshlink_handle {
 	char line[4096];
 	char buffer[4096];
 	size_t blen;
+
+	pthread_t discovery_thread;
+	bool discovery_threadstarted;
+	struct CattaServer *catta_server;
+	struct CattaSServiceBrowser *catta_browser;
+	struct CattaSimplePoll *catta_poll;
+	struct CattaSEntryGroup *catta_group;
+	char* catta_servicetype;
 };
 
 /// A handle for a MeshLink node.
@@ -132,6 +147,16 @@ struct meshlink_node {
 	void *priv;
 };
 
+/// A channel.
+struct meshlink_channel {
+	struct node_t *node;
+	void *priv;
+
+	struct utcp_connection *c;
+	meshlink_channel_receive_cb_t receive_cb;
+	meshlink_channel_poll_cb_t poll_cb;
+};
+
 /// Header for data packets routed between nodes
 typedef struct meshlink_packethdr {
 	uint8_t destination[16];
@@ -139,6 +164,17 @@ typedef struct meshlink_packethdr {
 } __attribute__ ((__packed__)) meshlink_packethdr_t;
 
 extern void meshlink_send_from_queue(event_loop_t* el,meshlink_handle_t *mesh);
-
+extern void update_node_status(meshlink_handle_t *mesh, struct node_t *n);
+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