Add support for AIO using filedescriptors.

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index c711aa57d8863eb67b2ee82852a39d00dd842319..569628cc3e6ebc05dca19f47d978c7e299c73961 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -110,15 +110,21 @@ struct meshlink_handle {
        struct splay_tree_t *past_request_tree;
        timeout_t past_request_timeout;
 
+       int connection_burst;
        int contradicting_add_edge;
        int contradicting_del_edge;
        int sleeptime;
+       time_t connection_burst_time;
        time_t last_config_check;
+       time_t last_hard_try;
        timeout_t pingtimer;
        timeout_t periodictimer;
 
        struct connection_t *everyone;
 
+       int next_pit;
+       int pits[10];
+
        // Infrequently used callbacks
        meshlink_node_status_cb_t node_status_cb;
        meshlink_channel_accept_cb_t channel_accept_cb;
@@ -138,6 +144,7 @@ struct meshlink_handle {
        int pinginterval;       /* seconds between pings */
        int pingtimeout;        /* seconds to wait for response */
        int maxtimeout;
+       int udp_choice;
 
        int netns;
 
@@ -152,6 +159,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;
 
@@ -175,14 +185,12 @@ struct meshlink_handle {
        char line[4096];
        char buffer[4096];
 
-       // Unused variables
+       // Proxy configuration, currently not exposed.
        char *proxyhost;
        char *proxyport;
        char *proxyuser;
        char *proxypass;
        proxytype_t proxytype;
-       sockaddr_t localdiscovery_address;
-       bool localdiscovery;
 };
 
 /// A handle for a MeshLink node.
@@ -197,12 +205,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;
 };
@@ -228,6 +252,6 @@ typedef struct {
        int edge_weight;
 } dev_class_traits_t;
 
-extern dev_class_traits_t dev_class_traits[];
+extern const dev_class_traits_t dev_class_traits[];
 
 #endif