Handle meshlink_channel_close() being called in callbacks.

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index a856180686de947c494e164ab47252a58aafb4cd..f9225ee5cca65f98ac29a71f0c883d2edfc1bcdf 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,17 +54,9 @@ typedef struct listen_socket_t {
        struct io_t tcp;
        struct io_t udp;
        sockaddr_t sa;
-       bool bindto;
+       sockaddr_t broadcast_sa;
 } listen_socket_t;
 
-typedef enum proxytype_t {
-       PROXY_NONE = 0,
-       PROXY_SOCKS4,
-       PROXY_SOCKS4A,
-       PROXY_SOCKS5,
-       PROXY_HTTP,
-} proxytype_t;
-
 struct meshlink_open_params {
        char *confbase;
        char *appname;
@@ -80,6 +73,7 @@ struct meshlink_open_params {
 typedef struct {
        int pinginterval;
        int pingtimeout;
+       int fast_retry_period;
        unsigned int min_connects;
        unsigned int max_connects;
        int edge_weight;
@@ -92,13 +86,15 @@ 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;
+       void *packet;
 
        // The most important network-related members come first
+       int reachable;
        int listen_sockets;
        listen_socket_t listen_socket[MAXSOCKETS];
 
@@ -124,12 +120,14 @@ struct meshlink_handle {
        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];
@@ -140,6 +138,7 @@ struct meshlink_handle {
        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;
@@ -160,12 +159,14 @@ struct meshlink_handle {
 
        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;
@@ -184,23 +185,12 @@ 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;
-       char *proxyuser;
-       char *proxypass;
-       proxytype_t proxytype;
+       // ADNS
+       pthread_t adns_thread;
+       pthread_cond_t adns_cond;
+       meshlink_queue_t adns_queue;
+       meshlink_queue_t adns_done_queue;
+       signal_t adns_signal;
 };
 
 /// A handle for a MeshLink node.
@@ -233,6 +223,7 @@ typedef struct meshlink_aio_buffer {
 struct meshlink_channel {
        struct node_t *node;
        void *priv;
+       bool in_callback;
 
        struct utcp_connection *c;
        meshlink_aio_buffer_t *aio_send;
@@ -254,5 +245,14 @@ extern meshlink_log_level_t global_log_level;
 extern meshlink_log_cb_t global_log_cb;
 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);
+
+/// Per-instance PRNG
+static inline int prng(meshlink_handle_t *mesh, uint64_t max) {
+       return xoshiro(mesh->prng_state) % max;
+}
+
+/// Fudge value of ~0.1 seconds, in microseconds.
+static const unsigned int TIMER_FUDGE = 0x8000000;
 
 #endif