X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmeshlink_internal.h;h=ac35f2765302c619121b9b3bcc5e37550dc8f819;hb=refs%2Fheads%2Fouter-routing;hp=46cbbb1ec15a734b34fed3e161e9ed3c8426fdbd;hpb=0bdce44687a22c8825695cba185b845f5ea5e060;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 46cbbb1e..ac35f276 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.
@@ -67,6 +66,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 +74,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];
@@ -89,6 +89,7 @@ struct meshlink_handle {
 	struct splay_tree_t *config;
 	struct splay_tree_t *edges;
 	struct splay_tree_t *nodes;
+	struct splay_tree_t *node_ids;
 
 	struct list_t *connections;
 	struct list_t *outgoings;
@@ -119,9 +120,9 @@ struct meshlink_handle {
 
 	bool default_blacklist;
 
-	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 */
@@ -162,16 +163,12 @@ struct meshlink_channel {
 	meshlink_channel_poll_cb_t poll_cb;
 };
 
-/// Header for data packets routed between nodes
-typedef struct meshlink_packethdr {
-	uint8_t destination[16];
-	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 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 {