X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=9abe19e0a20a3e65f4deee53fcfbaa3b2a34274d;hb=24fa6a751224fb4b48bdb3cd1416b0222743e522;hp=994f25bf9bd5f077403ffc67ec5f484ce6165d50;hpb=e4e5a81447142da0fb1291b2d2119ed6981b89e5;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 994f25bf..9abe19e0 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -33,10 +33,10 @@
 
 #define MAXSOCKETS 8    /* Probably overkill... */
 
-struct AvahiServer;
-struct AvahiSServiceBrowser;
-struct AvahiSimplePoll;
-struct AvahiSEntryGroup;
+struct CattaServer;
+struct CattaSServiceBrowser;
+struct CattaSimplePoll;
+struct CattaSEntryGroup;
 
 typedef struct listen_socket_t {
 	struct io_t tcp;
@@ -54,18 +54,13 @@ typedef enum proxytype_t {
 	PROXY_EXEC,
 } proxytype_t;
 
-typedef struct outpacketqueue {
-	meshlink_node_t *destination;
-	const void *data;
-	unsigned int len;
-} outpacketqueue_t;
-
 /// A handle for an instance of MeshLink.
 struct meshlink_handle {
 	char *name;
+	void *priv;
+
 	char *appname;
 	dev_class_t devclass;
-	void *priv;
 
 	char *confbase;
 
@@ -74,6 +69,8 @@ struct meshlink_handle {
 	meshlink_log_cb_t log_cb;
 	meshlink_log_level_t log_level;
 
+	meshlink_channel_accept_cb_t channel_accept_cb;
+
 	pthread_t thread;
 	bool threadstarted;
 	pthread_mutex_t outpacketqueue_mutex;
@@ -115,6 +112,8 @@ struct meshlink_handle {
 	bool localdiscovery;
 	sockaddr_t localdiscovery_address;
 
+	bool default_blacklist;
+
 	hash_t *node_udp_cache;
 	struct connection_t *everyone;
 	struct ecdsa *invitation_key;
@@ -135,11 +134,11 @@ struct meshlink_handle {
 
 	pthread_t discovery_thread;
 	bool discovery_threadstarted;
-	struct AvahiServer *avahi_server;
-	struct AvahiSServiceBrowser *avahi_browser;
-	struct AvahiSimplePoll *avahi_poll;
-	struct AvahiSEntryGroup *avahi_group;
-	char* avahi_servicetype;
+	struct CattaServer *catta_server;
+	struct CattaSServiceBrowser *catta_browser;
+	struct CattaSimplePoll *catta_poll;
+	struct CattaSEntryGroup *catta_group;
+	char* catta_servicetype;
 };
 
 /// A handle for a MeshLink node.
@@ -148,6 +147,16 @@ struct meshlink_node {
 	void *priv;
 };
 
+/// A channel.
+struct meshlink_channel {
+	struct node_t *node;
+	void *priv;
+
+	struct utcp_connection *c;
+	meshlink_channel_receive_cb_t receive_cb;
+	meshlink_channel_poll_cb_t poll_cb;
+};
+
 /// Header for data packets routed between nodes
 typedef struct meshlink_packethdr {
 	uint8_t destination[16];
@@ -155,6 +164,7 @@ typedef struct meshlink_packethdr {
 } __attribute__ ((__packed__)) meshlink_packethdr_t;
 
 extern void meshlink_send_from_queue(event_loop_t* el,meshlink_handle_t *mesh);
+extern void update_node_status(meshlink_handle_t *mesh, struct node_t *n);
 extern meshlink_log_level_t global_log_level;
 extern meshlink_log_cb_t global_log_cb;