X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=545bd52615c87edb6b5b0b23dc9bf253de6fbbf8;hb=f712fdc0b3de22566cdf06954256c62f46f25542;hp=492e2b2bd4d1c617a7fdff51ded5bfe5e6a64532;hpb=5dec7459d9920c930bdfb3ac0f2a3740a6247ec0;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 492e2b2b..545bd526 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -55,7 +55,6 @@ typedef enum proxytype_t {
 	PROXY_SOCKS4A,
 	PROXY_SOCKS5,
 	PROXY_HTTP,
-	PROXY_EXEC,
 } proxytype_t;
 
 /// A handle for an instance of MeshLink.
@@ -74,10 +73,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];
@@ -122,6 +121,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 */
@@ -143,7 +143,7 @@ struct meshlink_handle {
 	struct CattaSServiceBrowser *catta_browser;
 	struct CattaSimplePoll *catta_poll;
 	struct CattaSEntryGroup *catta_group;
-	char* catta_servicetype;
+	char *catta_servicetype;
 };
 
 /// A handle for a MeshLink node.
@@ -168,10 +168,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 {