Don't link with Catta anymore.

[meshlink] / src / meshlink_internal.h

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 6cbe6093f42258f84ecb5b0c133b7d2018965ffa..6a433b608cbb7d1585bc32171feb7f217c6a5c40 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;
@@ -59,6 +54,7 @@ typedef struct listen_socket_t {
 
 struct meshlink_open_params {
        char *confbase;
+       char *lock_filename;
        char *appname;
        char *name;
        dev_class_t devclass;
@@ -162,7 +158,7 @@ struct meshlink_handle {
        int netns;
 
        bool default_blacklist;
-       bool discovery;         // Whether Catta is enabled or not
+       bool discovery;         // Whether mDNS discovery is enabled or not
        bool inviter_commits_first;
 
        // Configuration
@@ -181,14 +177,13 @@ struct meshlink_handle {
        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;
+       // mDNS discovery
+       io_t pfroute_io;
+       int *discovery_ifaces;
+       struct discovery_address *discovery_addresses;
+       int discovery_iface_count;
+       int discovery_address_count;
+       io_t discovery_sockets[2];
 
        // ADNS
        pthread_t adns_thread;