Remove asynchronous DNS support.

[meshlink-tiny] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 26186015cb3b40660acc040830a865fc69610cf0..9b506f03dba0eaf7d80ae5a6b3999cfecb3c9f0f 100644 (file)
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -21,14 +21,14 @@
 */
 
 #ifdef MESHLINK_H
-#error You must not include both meshlink.h and meshlink_internal.h!
+#error You must not include both meshlink-tiny.h and meshlink_internal.h!
 #endif
 
 #include "system.h"
 
 #include "event.h"
 #include "hash.h"
-#include "meshlink.h"
+#include "meshlink-tiny.h"
 #include "meshlink_queue.h"
 #include "sockaddr.h"
 #include "sptps.h"
@@ -47,7 +47,6 @@ static const char meshlink_udp_label[] = "MeshLink UDP";
 
 typedef struct listen_socket_t {
        struct io_t tcp;
-       struct io_t udp;
        sockaddr_t sa;
        sockaddr_t broadcast_sa;
 } listen_socket_t;
@@ -100,10 +99,7 @@ struct meshlink_handle {
        meshlink_queue_t outpacketqueue;
        signal_t datafromapp;
 
-       hash_t *node_udp_cache;
-
        struct splay_tree_t *nodes;
-       struct splay_tree_t *edges;
 
        struct list_t *connections;
        struct list_t *outgoings;
@@ -139,25 +135,19 @@ struct meshlink_handle {
        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;
 
        // Mesh parameters
        char *appname;
        char *myport;
 
        struct ecdsa *private_key;
-       struct ecdsa *invitation_key;
 
        dev_class_t devclass;
 
-       int invitation_timeout;
-       int udp_choice;
-
        dev_class_traits_t dev_class_traits[DEV_CLASS_COUNT];
 
        int netns;
 
-       bool default_blacklist;
        bool inviter_commits_first;
 
        // Configuration
@@ -165,36 +155,12 @@ struct meshlink_handle {
        FILE *lockfile;
        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;
        bool threadstarted;
-
-       // 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.