X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=dd9c113831d368909d93bf852dc48c1e6cb234b5;hb=c31f626c3a252a0d6805a5f3ca9154d934ea41f5;hp=ca2df2c543cf055866d1bf0618617c5eabee920c;hpb=e40d5bf3a0e030105334046319f377efbf3f06c4;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index ca2df2c5..dd9c1138 100644
--- 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;
@@ -142,6 +137,7 @@ 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;
@@ -160,7 +156,6 @@ struct meshlink_handle {
 	int netns;
 
 	bool default_blacklist;
-	bool discovery;         // Whether Catta is enabled or not
 	bool inviter_commits_first;
 
 	// Configuration
@@ -173,19 +168,23 @@ struct meshlink_handle {
 	// 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;
+
+	// 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;