Never automatically try to bind to ports >= 32768.

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index eaa89c5dbd59fb3aa3baf8f8c96db8e130b29e07..b57f212c5fdf6569243c2256497f8e11f5514d6f 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -45,11 +45,6 @@ static const char meshlink_udp_label[] = "MeshLink UDP";
 #define MESHLINK_CONFIG_VERSION 2
 #define MESHLINK_INVITATION_VERSION 2
 
-struct CattaServer;
-struct CattaSServiceBrowser;
-struct CattaSimplePoll;
-struct CattaSEntryGroup;
-
 typedef struct listen_socket_t {
        struct io_t tcp;
        struct io_t udp;
@@ -57,16 +52,9 @@ typedef struct listen_socket_t {
        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 *lock_filename;
        char *appname;
        char *name;
        dev_class_t devclass;
@@ -75,6 +63,7 @@ struct meshlink_open_params {
 
        const void *key;
        size_t keylen;
+       meshlink_storage_policy_t storage_policy;
 };
 
 /// Device class traits
@@ -82,6 +71,7 @@ typedef struct {
        int pinginterval;
        int pingtimeout;
        int fast_retry_period;
+       int maxtimeout;
        unsigned int min_connects;
        unsigned int max_connects;
        int edge_weight;
@@ -99,6 +89,7 @@ struct meshlink_handle {
        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;
@@ -127,7 +118,6 @@ 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;
@@ -142,11 +132,15 @@ struct meshlink_handle {
 
        // Infrequently used callbacks
        meshlink_node_status_cb_t node_status_cb;
+       meshlink_node_status_cb_t meta_status_cb;
        meshlink_node_pmtu_cb_t node_pmtu_cb;
+       meshlink_channel_listen_cb_t channel_listen_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;
+       meshlink_blacklisted_cb_t blacklisted_cb;
+       meshlink_thread_status_cb_t thread_status_cb;
 
        // Mesh parameters
        char *appname;
@@ -158,7 +152,6 @@ struct meshlink_handle {
        dev_class_t devclass;
 
        int invitation_timeout;
-       int maxtimeout;
        int udp_choice;
 
        dev_class_traits_t dev_class_traits[DEV_CLASS_COUNT];
@@ -166,7 +159,6 @@ struct meshlink_handle {
        int netns;
 
        bool default_blacklist;
-       bool discovery;         // Whether Catta is enabled or not
        bool inviter_commits_first;
 
        // Configuration
@@ -175,30 +167,35 @@ struct meshlink_handle {
        void *config_key;
        char *external_address_url;
        struct list_t *invitation_addresses;
+       meshlink_storage_policy_t storage_policy;
 
        // Thread management
        pthread_t thread;
        pthread_cond_t cond;
-       pthread_mutex_t discovery_mutex;
-       pthread_cond_t discovery_cond;
        bool threadstarted;
-       bool discovery_threadstarted;
-
-       // Catta
-       pthread_t discovery_thread;
-       struct CattaServer *catta_server;
-       struct CattaSServiceBrowser *catta_browser;
-       struct CattaSimplePoll *catta_poll;
-       struct CattaSEntryGroup *catta_group;
-       char *catta_servicetype;
-       unsigned int catta_interfaces;
-
-       // Proxy configuration, currently not exposed.
-       char *proxyhost;
-       char *proxyport;
-       char *proxyuser;
-       char *proxypass;
-       proxytype_t proxytype;
+
+       // mDNS discovery
+       struct {
+               bool enabled;
+               io_t pfroute_io;
+               int *ifaces;
+               struct discovery_address *addresses;
+               int iface_count;
+               int address_count;
+               io_t sockets[2];
+               time_t last_update;
+#ifdef __APPLE__
+               pthread_t thread;
+               void *runloop;
+#endif
+       } discovery;
+
+       // 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.
@@ -231,6 +228,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;
@@ -245,14 +243,15 @@ typedef struct meshlink_packethdr {
        uint8_t source[16];
 } __attribute__((__packed__)) meshlink_packethdr_t;
 
-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);
+void meshlink_send_from_queue(event_loop_t *loop, void *mesh);
+void update_node_status(meshlink_handle_t *mesh, struct node_t *n);
+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 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);
+void handle_duplicate_node(meshlink_handle_t *mesh, struct node_t *n);
+void handle_network_change(meshlink_handle_t *mesh, bool online);
+void call_error_cb(meshlink_handle_t *mesh, meshlink_errno_t meshlink_errno);
+void channel_receive(meshlink_handle_t *mesh, meshlink_node_t *node, const void *data, size_t len);
 
 /// Per-instance PRNG
 static inline int prng(meshlink_handle_t *mesh, uint64_t max) {
@@ -260,6 +259,6 @@ static inline int prng(meshlink_handle_t *mesh, uint64_t max) {
 }
 
 /// Fudge value of ~0.1 seconds, in microseconds.
-static const unsigned int TIMER_FUDGE = 0x20000;
+static const unsigned int TIMER_FUDGE = 0x8000000;
 
 #endif