X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=b3ac72c40a2833f74abd78f68cb292b4a54f2e20;hb=fb3ae8985db2f41c498b4fdaf2ca1566dbc84954;hp=2a8b7ebf601b87aab7d5d25df4dc448a6f4020c0;hpb=2dedfacd26539e45171c243d1e9df49993298dbb;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 2a8b7ebf..b3ac72c4 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -54,18 +54,13 @@ 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 *name;
+	void *priv;
+
 	char *appname;
 	dev_class_t devclass;
-	void *priv;
 
 	char *confbase;
 
@@ -74,10 +69,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;
@@ -115,6 +112,8 @@ 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;
@@ -148,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];
@@ -155,6 +164,7 @@ 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;