X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=ac35f2765302c619121b9b3bcc5e37550dc8f819;hb=refs%2Fheads%2Fouter-routing;hp=710acdd794c40e1d67d30a5dcb0966c5ce1765df;hpb=196806f90f40fcc0cf727abd4bed6bc5aefff5ff;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 710acdd7..ac35f276 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -1,6 +1,9 @@
+#ifndef MESHLINK_INTERNAL_H
+#define MESHLINK_INTERNAL_H
+
 /*
     meshlink_internal.h -- Internal parts of the public API.
-    Copyright (C) 2014 Guus Sliepen <guus@meshlink.io>
+    Copyright (C) 2014, 2017 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,9 +20,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef MESHLINK_INTERNAL_H
-#define MESHLINK_INTERNAL_H
-
 #include "system.h"
 
 #include "event.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;
@@ -113,14 +114,15 @@ struct meshlink_handle {
 	char *proxypass;
 	proxytype_t proxytype;
 
+	bool discovery;         // Whether Catta is enabled or not
 	bool localdiscovery;
 	sockaddr_t localdiscovery_address;
 
 	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 */
@@ -142,7 +144,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.
@@ -161,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 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 {
@@ -181,4 +179,4 @@ typedef struct {
 
 extern dev_class_traits_t dev_class_traits[];
 
-#endif // MESHLINK_INTERNAL_H
+#endif