Add meshlink_add_invitation_address(), deprecate meshlink_add_address().

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 94e8b7983d00e12a637cd78dc945c21f829e9952..42df8b895cc90323e2391eabf52581746823ccd2 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -32,6 +32,7 @@
 #include "meshlink_queue.h"
 #include "sockaddr.h"
 #include "sptps.h"
+#include "xoshiro.h"
 
 #include <pthread.h>
 
@@ -41,8 +42,8 @@ static const char meshlink_invitation_label[] = "MeshLink invitation";
 static const char meshlink_tcp_label[] = "MeshLink TCP";
 static const char meshlink_udp_label[] = "MeshLink UDP";
 
-#define MESHLINK_CONFIG_VERSION 1
-#define MESHLINK_INVITATION_VERSION 1
+#define MESHLINK_CONFIG_VERSION 2
+#define MESHLINK_INVITATION_VERSION 2
 
 struct CattaServer;
 struct CattaSServiceBrowser;
@@ -53,6 +54,7 @@ typedef struct listen_socket_t {
        struct io_t tcp;
        struct io_t udp;
        sockaddr_t sa;
+       sockaddr_t broadcast_sa;
        bool bindto;
 } listen_socket_t;
 
@@ -76,6 +78,16 @@ struct meshlink_open_params {
        size_t keylen;
 };
 
+/// Device class traits
+typedef struct {
+       int pinginterval;
+       int pingtimeout;
+       int fast_retry_period;
+       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
@@ -83,13 +95,14 @@ struct meshlink_handle {
        void *priv;
 
        // private members
-       pthread_mutex_t mesh_mutex;
+       pthread_mutex_t mutex;
        event_loop_t loop;
        struct node_t *self;
        meshlink_log_cb_t log_cb;
        meshlink_log_level_t log_level;
 
        // The most important network-related members come first
+       int reachable;
        int listen_sockets;
        listen_socket_t listen_socket[MAXSOCKETS];
 
@@ -110,20 +123,31 @@ 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;
+       time_t last_unreachable;
        timeout_t pingtimer;
        timeout_t periodictimer;
 
        struct connection_t *everyone;
+       uint64_t prng_state[4];
+       uint32_t session_id;
+
+       int next_pit;
+       int pits[10];
 
        // 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;
+       meshlink_error_cb_t error_cb;
 
        // Mesh parameters
        char *appname;
@@ -132,26 +156,32 @@ 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;
        bool discovery;         // Whether Catta is enabled or not
-
+       bool inviter_commits_first;
 
        // Configuration
        char *confbase;
-       FILE *conffile;
+       FILE *lockfile;
        void *config_key;
+       char *external_address_url;
+       struct list_t *invitation_addresses;
 
        // Thread management
        pthread_t thread;
+       pthread_cond_t cond;
+       pthread_mutex_t discovery_mutex;
+       pthread_cond_t discovery_cond;
        bool threadstarted;
        bool discovery_threadstarted;
 
@@ -164,17 +194,6 @@ struct meshlink_handle {
        char *catta_servicetype;
        unsigned int catta_interfaces;
 
-       // State used for meshlink_join()
-       int sock;
-       char cookie[18], hash[18];
-       bool success;
-       sptps_t sptps;
-       char *data;
-       size_t thedatalen;
-       size_t blen;
-       char line[4096];
-       char buffer[4096];
-
        // Proxy configuration, currently not exposed.
        char *proxyhost;
        char *proxyport;
@@ -195,12 +214,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;
 };
@@ -211,21 +246,21 @@ 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);
+extern void call_error_cb(meshlink_handle_t *mesh, meshlink_errno_t meshlink_errno);
 
-/// Device class traits
-typedef struct {
-       unsigned int min_connects;
-       unsigned int max_connects;
-       int edge_weight;
-} dev_class_traits_t;
+/// Per-instance PRNG
+static inline int prng(meshlink_handle_t *mesh, uint64_t max) {
+       return xoshiro(mesh->prng_state) % max;
+}
 
-extern dev_class_traits_t dev_class_traits[];
+/// Fudge value of ~0.1 seconds, in microseconds.
+static const unsigned int TIMER_FUDGE = 0x20000;
 
 #endif