X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=9abe19e0a20a3e65f4deee53fcfbaa3b2a34274d;hb=89d675c474a6717d9daa8b5d9ff2c0f2c03666f9;hp=4be2f739eca43835650126d9025235187c70b76c;hpb=56ecf5049433a45c865f945915b65bdae307ba4f;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 4be2f739..9abe19e0 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -24,12 +24,20 @@
 
 #include "event.h"
 #include "hash.h"
-#include "logger.h"
 #include "meshlink.h"
+#include "meshlink_queue.h"
 #include "sockaddr.h"
+#include "sptps.h"
+
+#include <pthread.h>
 
 #define MAXSOCKETS 8    /* Probably overkill... */
 
+struct CattaServer;
+struct CattaSServiceBrowser;
+struct CattaSimplePoll;
+struct CattaSEntryGroup;
+
 typedef struct listen_socket_t {
 	struct io_t tcp;
 	struct io_t udp;
@@ -48,17 +56,29 @@ typedef enum proxytype_t {
 
 /// A handle for an instance of MeshLink.
 struct meshlink_handle {
-	char *confbase;
 	char *name;
+	void *priv;
+
+	char *appname;
+	dev_class_t devclass;
+
+	char *confbase;
 
 	meshlink_receive_cb_t receive_cb;
 	meshlink_node_status_cb_t node_status_cb;
 	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;
+	pthread_mutex_t mesh_mutex;
+	event_loop_t loop;
 	listen_socket_t listen_socket[MAXSOCKETS];
 	int listen_sockets;
+	signal_t datafromapp;
 
 	struct node_t *self;
 
@@ -69,6 +89,11 @@ struct meshlink_handle {
 	struct list_t *connections;
 	struct list_t *outgoings;
 
+	meshlink_queue_t outpacketqueue;
+
+	struct splay_tree_t *past_request_tree;
+	timeout_t past_request_timeout;
+
 	int contradicting_add_edge;
 	int contradicting_del_edge;
 	int sleeptime;
@@ -87,11 +112,33 @@ 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;
 
-	debug_t debug_level;
+	int pinginterval;	/* seconds between pings */
+	int pingtimeout;	/* seconds to wait for response */
+	int maxtimeout;
+
+	int sock;
+	sptps_t sptps;
+	char cookie[18], hash[18];
+	char *data;
+	size_t thedatalen;
+	bool success;
+	char line[4096];
+	char buffer[4096];
+	size_t blen;
+
+	pthread_t discovery_thread;
+	bool discovery_threadstarted;
+	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.
@@ -100,10 +147,34 @@ struct meshlink_node {
 	void *priv;
 };
 
-// This is a *temporary* global variable which will keep the compiler happy
-// while refactoring the code to get rid of global variables.
-// TODO: remove this when no other global variables remain.
+/// 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;
+};
 
-extern meshlink_handle_t *mesh;
+/// 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;
+
+/// Device class traits
+typedef struct {
+	unsigned int min_connects;
+	unsigned int max_connects;
+	int edge_weight;
+} dev_class_traits_t;
+
+extern dev_class_traits_t dev_class_traits[];
 
 #endif // MESHLINK_INTERNAL_H