X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=a856180686de947c494e164ab47252a58aafb4cd;hb=9cde0d32cf209388cc59b06b7dcb0c3432f97da5;hp=4056df316ed0ed27cd1fb391e08ee836ddc998da;hpb=fd7e81983ca4cae7cdf2a67a35500284f17761c4;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 4056df31..a8561806 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -76,6 +76,15 @@ struct meshlink_open_params {
 	size_t keylen;
 };
 
+/// Device class traits
+typedef struct {
+	int pinginterval;
+	int pingtimeout;
+	unsigned int min_connects;
+	unsigned int max_connects;
+	int edge_weight;
+} dev_class_traits_t;
+
 /// A handle for an instance of MeshLink.
 struct meshlink_handle {
 	// public members
@@ -127,6 +136,7 @@ struct meshlink_handle {
 
 	// Infrequently used callbacks
 	meshlink_node_status_cb_t node_status_cb;
+	meshlink_node_pmtu_cb_t node_pmtu_cb;
 	meshlink_channel_accept_cb_t channel_accept_cb;
 	meshlink_node_duplicate_cb_t node_duplicate_cb;
 	meshlink_connection_try_cb_t connection_try_cb;
@@ -138,14 +148,14 @@ struct meshlink_handle {
 	struct ecdsa *private_key;
 	struct ecdsa *invitation_key;
 
-	int32_t devclass;
+	dev_class_t devclass;
 
 	int invitation_timeout;
-	int pinginterval;       /* seconds between pings */
-	int pingtimeout;        /* seconds to wait for response */
 	int maxtimeout;
 	int udp_choice;
 
+	dev_class_traits_t dev_class_traits[DEV_CLASS_COUNT];
+
 	int netns;
 
 	bool default_blacklist;
@@ -159,6 +169,9 @@ struct meshlink_handle {
 
 	// Thread management
 	pthread_t thread;
+	pthread_cond_t cond;
+	pthread_mutex_t discovery_mutex;
+	pthread_cond_t discovery_cond;
 	bool threadstarted;
 	bool discovery_threadstarted;
 
@@ -202,12 +215,28 @@ struct meshlink_submesh {
 	void *priv;
 };
 
+/// An AIO buffer.
+typedef struct meshlink_aio_buffer {
+	const void *data;
+	int fd;
+	size_t len;
+	size_t done;
+	union {
+		meshlink_aio_cb_t buffer;
+		meshlink_aio_fd_cb_t fd;
+	} cb;
+	void *priv;
+	struct meshlink_aio_buffer *next;
+} meshlink_aio_buffer_t;
+
 /// A channel.
 struct meshlink_channel {
 	struct node_t *node;
 	void *priv;
 
 	struct utcp_connection *c;
+	meshlink_aio_buffer_t *aio_send;
+	meshlink_aio_buffer_t *aio_receive;
 	meshlink_channel_receive_cb_t receive_cb;
 	meshlink_channel_poll_cb_t poll_cb;
 };
@@ -218,21 +247,12 @@ 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);
+extern void meshlink_send_from_queue(event_loop_t *loop, void *mesh);
 extern void update_node_status(meshlink_handle_t *mesh, struct node_t *n);
+extern void update_node_pmtu(meshlink_handle_t *mesh, struct node_t *n);
 extern meshlink_log_level_t global_log_level;
 extern meshlink_log_cb_t global_log_cb;
-extern int check_port(meshlink_handle_t *mesh);
 extern void handle_duplicate_node(meshlink_handle_t *mesh, struct node_t *n);
 extern void handle_network_change(meshlink_handle_t *mesh, bool online);
 
-/// Device class traits
-typedef struct {
-	unsigned int min_connects;
-	unsigned int max_connects;
-	int edge_weight;
-} dev_class_traits_t;
-
-extern const dev_class_traits_t dev_class_traits[];
-
 #endif