X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=45c6c951be3697d0d6d1fd7508aa2d9798e8c5fe;hb=ed1f31db1e8840ffd6849b48bcad93e9975a24bb;hp=fa5e60ea44fbf099ef77e9dafc0123f1c19735eb;hpb=61d9b04f66055e61f0afdf8955ff890f4da39288;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index fa5e60ea..45c6c951 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -55,9 +55,17 @@ typedef enum proxytype_t {
 	PROXY_SOCKS4A,
 	PROXY_SOCKS5,
 	PROXY_HTTP,
-	PROXY_EXEC,
 } proxytype_t;
 
+struct meshlink_open_params {
+	char *confbase;
+	char *appname;
+	char *name;
+	dev_class_t devclass;
+
+	int netns;
+};
+
 /// A handle for an instance of MeshLink.
 struct meshlink_handle {
 	char *name;
@@ -67,6 +75,7 @@ struct meshlink_handle {
 	dev_class_t devclass;
 
 	char *confbase;
+	FILE *conffile;
 
 	meshlink_receive_cb_t receive_cb;
 	meshlink_node_status_cb_t node_status_cb;
@@ -74,10 +83,10 @@ struct meshlink_handle {
 	meshlink_log_level_t log_level;
 
 	meshlink_channel_accept_cb_t channel_accept_cb;
+	meshlink_node_duplicate_cb_t node_duplicate_cb;
 
 	pthread_t thread;
 	bool threadstarted;
-	pthread_mutex_t outpacketqueue_mutex;
 	pthread_mutex_t mesh_mutex;
 	event_loop_t loop;
 	listen_socket_t listen_socket[MAXSOCKETS];
@@ -92,6 +101,7 @@ struct meshlink_handle {
 
 	struct list_t *connections;
 	struct list_t *outgoings;
+	struct list_t *submeshes;
 
 	meshlink_queue_t outpacketqueue;
 
@@ -113,6 +123,7 @@ struct meshlink_handle {
 	char *proxypass;
 	proxytype_t proxytype;
 
+	bool discovery;         // Whether Catta is enabled or not
 	bool localdiscovery;
 	sockaddr_t localdiscovery_address;
 
@@ -121,6 +132,7 @@ struct meshlink_handle {
 	hash_t *node_udp_cache;
 	struct connection_t *everyone;
 	struct ecdsa *invitation_key;
+	int invitation_timeout;
 
 	int pinginterval;       /* seconds between pings */
 	int pingtimeout;        /* seconds to wait for response */
@@ -142,7 +154,9 @@ struct meshlink_handle {
 	struct CattaSServiceBrowser *catta_browser;
 	struct CattaSimplePoll *catta_poll;
 	struct CattaSEntryGroup *catta_group;
-	char* catta_servicetype;
+	char *catta_servicetype;
+
+	int netns;
 };
 
 /// A handle for a MeshLink node.
@@ -151,6 +165,12 @@ struct meshlink_node {
 	void *priv;
 };
 
+/// A handle for a node Sub-Mesh.
+struct meshlink_submesh {
+	const char *name;
+	void *priv;
+};
+
 /// A channel.
 struct meshlink_channel {
 	struct node_t *node;
@@ -167,10 +187,12 @@ typedef struct meshlink_packethdr {
 	uint8_t source[16];
 } __attribute__((__packed__)) meshlink_packethdr_t;
 
-extern void meshlink_send_from_queue(event_loop_t* el,meshlink_handle_t *mesh);
+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;
+extern int check_port(meshlink_handle_t *mesh);
+extern void handle_duplicate_node(meshlink_handle_t *mesh, struct node_t *n);
 
 /// Device class traits
 typedef struct {