X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=c6c99541d66b0d7fa622c097313e1090b19dc09c;hb=34a52e6e69be085ee99755c2890268d2ce11f9b4;hp=b3ac72c40a2833f74abd78f68cb292b4a54f2e20;hpb=fb3ae8985db2f41c498b4fdaf2ca1566dbc84954;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index b3ac72c4..c6c99541 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"
@@ -33,10 +33,14 @@
 
 #define MAXSOCKETS 8    /* Probably overkill... */
 
-struct AvahiServer;
-struct AvahiSServiceBrowser;
-struct AvahiSimplePoll;
-struct AvahiSEntryGroup;
+static const char meshlink_invitation_label[] = "MeshLink invitation";
+static const char meshlink_tcp_label[] = "MeshLink TCP";
+static const char meshlink_udp_label[] = "MeshLink UDP";
+
+struct CattaServer;
+struct CattaSServiceBrowser;
+struct CattaSimplePoll;
+struct CattaSEntryGroup;
 
 typedef struct listen_socket_t {
 	struct io_t tcp;
@@ -51,7 +55,6 @@ typedef enum proxytype_t {
 	PROXY_SOCKS4A,
 	PROXY_SOCKS5,
 	PROXY_HTTP,
-	PROXY_EXEC,
 } proxytype_t;
 
 /// A handle for an instance of MeshLink.
@@ -73,7 +76,6 @@ struct meshlink_handle {
 
 	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];
@@ -109,6 +111,7 @@ struct meshlink_handle {
 	char *proxypass;
 	proxytype_t proxytype;
 
+	bool discovery;         // Whether Catta is enabled or not
 	bool localdiscovery;
 	sockaddr_t localdiscovery_address;
 
@@ -117,9 +120,10 @@ 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 */
+	int pinginterval;       /* seconds between pings */
+	int pingtimeout;        /* seconds to wait for response */
 	int maxtimeout;
 
 	int sock;
@@ -134,11 +138,11 @@ struct meshlink_handle {
 
 	pthread_t discovery_thread;
 	bool discovery_threadstarted;
-	struct AvahiServer *avahi_server;
-	struct AvahiSServiceBrowser *avahi_browser;
-	struct AvahiSimplePoll *avahi_poll;
-	struct AvahiSEntryGroup *avahi_group;
-	char* avahi_servicetype;
+	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.
@@ -161,12 +165,13 @@ struct meshlink_channel {
 typedef struct meshlink_packethdr {
 	uint8_t destination[16];
 	uint8_t source[16];
-} __attribute__ ((__packed__)) meshlink_packethdr_t;
+} __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);
 
 /// Device class traits
 typedef struct {
@@ -177,4 +182,4 @@ typedef struct {
 
 extern dev_class_traits_t dev_class_traits[];
 
-#endif // MESHLINK_INTERNAL_H
+#endif