X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmeshlink_internal.h;h=26186015cb3b40660acc040830a865fc69610cf0;hb=325d837df2ec867c668b6a911b97e719f196ba0e;hp=ca2df2c543cf055866d1bf0618617c5eabee920c;hpb=e40d5bf3a0e030105334046319f377efbf3f06c4;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index ca2df2c5..26186015 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;
@@ -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;
@@ -67,6 +63,7 @@ struct meshlink_open_params {
 
 	const void *key;
 	size_t keylen;
+	meshlink_storage_policy_t storage_policy;
 };
 
 /// Device class traits
@@ -142,6 +139,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 +158,6 @@ struct meshlink_handle {
 	int netns;
 
 	bool default_blacklist;
-	bool discovery;         // Whether Catta is enabled or not
 	bool inviter_commits_first;
 
 	// Configuration
@@ -169,23 +166,28 @@ 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;
+
+	// 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;