X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=4e459b4e847bd5861047ebccca89caeeca8bc33a;hb=b1cae6a2011f704dc4d3b02972def561d5c6bcb9;hp=0e3581f5142fa9354350e1efa6451f88dc6e98a7;hpb=d5112a0a5e7036957f22c604e767e33c4b10b775;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 0e3581f5..4e459b4e 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
@@ -138,14 +147,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;
@@ -208,9 +217,13 @@ struct meshlink_submesh {
 /// An AIO buffer.
 typedef struct meshlink_aio_buffer {
 	const void *data;
+	int fd;
 	size_t len;
 	size_t done;
-	meshlink_aio_cb_t cb;
+	union {
+		meshlink_aio_cb_t buffer;
+		meshlink_aio_fd_cb_t fd;
+	} cb;
 	void *priv;
 	struct meshlink_aio_buffer *next;
 } meshlink_aio_buffer_t;
@@ -221,7 +234,8 @@ struct meshlink_channel {
 	void *priv;
 
 	struct utcp_connection *c;
-	meshlink_aio_buffer_t *aio;
+	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;
 };
@@ -240,13 +254,4 @@ 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