#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;
struct meshlink_open_params {
char *confbase;
+ char *lock_filename;
char *appname;
char *name;
dev_class_t devclass;
const void *key;
size_t keylen;
+ meshlink_storage_policy_t storage_policy;
};
/// Device class traits
// 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;
// Mesh parameters
char *appname;
int netns;
bool default_blacklist;
- bool discovery; // Whether Catta is enabled or not
bool inviter_commits_first;
// Configuration
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;