X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=ca2df2c543cf055866d1bf0618617c5eabee920c;hb=e40d5bf3a0e030105334046319f377efbf3f06c4;hp=8a632e26f0527e676c6cdbf662a05df70fd73ce8;hpb=e25f5166a3edc98f4a333c98881d4899635f1144;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 8a632e26..ca2df2c5 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -57,14 +57,6 @@ typedef struct listen_socket_t {
 	sockaddr_t broadcast_sa;
 } listen_socket_t;
 
-typedef enum proxytype_t {
-	PROXY_NONE = 0,
-	PROXY_SOCKS4,
-	PROXY_SOCKS4A,
-	PROXY_SOCKS5,
-	PROXY_HTTP,
-} proxytype_t;
-
 struct meshlink_open_params {
 	char *confbase;
 	char *appname;
@@ -82,6 +74,7 @@ typedef struct {
 	int pinginterval;
 	int pingtimeout;
 	int fast_retry_period;
+	int maxtimeout;
 	unsigned int min_connects;
 	unsigned int max_connects;
 	int edge_weight;
@@ -142,7 +135,9 @@ struct meshlink_handle {
 
 	// Infrequently used callbacks
 	meshlink_node_status_cb_t node_status_cb;
+	meshlink_node_status_cb_t meta_status_cb;
 	meshlink_node_pmtu_cb_t node_pmtu_cb;
+	meshlink_channel_listen_cb_t channel_listen_cb;
 	meshlink_channel_accept_cb_t channel_accept_cb;
 	meshlink_node_duplicate_cb_t node_duplicate_cb;
 	meshlink_connection_try_cb_t connection_try_cb;
@@ -158,7 +153,6 @@ struct meshlink_handle {
 	dev_class_t devclass;
 
 	int invitation_timeout;
-	int maxtimeout;
 	int udp_choice;
 
 	dev_class_traits_t dev_class_traits[DEV_CLASS_COUNT];
@@ -199,13 +193,6 @@ struct meshlink_handle {
 	meshlink_queue_t adns_queue;
 	meshlink_queue_t adns_done_queue;
 	signal_t adns_signal;
-
-	// Proxy configuration, currently not exposed.
-	char *proxyhost;
-	char *proxyport;
-	char *proxyuser;
-	char *proxypass;
-	proxytype_t proxytype;
 };
 
 /// A handle for a MeshLink node.
@@ -238,6 +225,7 @@ typedef struct meshlink_aio_buffer {
 struct meshlink_channel {
 	struct node_t *node;
 	void *priv;
+	bool in_callback;
 
 	struct utcp_connection *c;
 	meshlink_aio_buffer_t *aio_send;
@@ -252,14 +240,14 @@ typedef struct meshlink_packethdr {
 	uint8_t source[16];
 } __attribute__((__packed__)) meshlink_packethdr_t;
 
-extern void meshlink_send_from_queue(event_loop_t *loop, void *mesh);
-extern void update_node_status(meshlink_handle_t *mesh, struct node_t *n);
-extern void update_node_pmtu(meshlink_handle_t *mesh, struct node_t *n);
+void meshlink_send_from_queue(event_loop_t *loop, void *mesh);
+void update_node_status(meshlink_handle_t *mesh, struct node_t *n);
+void update_node_pmtu(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 void handle_duplicate_node(meshlink_handle_t *mesh, struct node_t *n);
-extern void handle_network_change(meshlink_handle_t *mesh, bool online);
-extern void call_error_cb(meshlink_handle_t *mesh, meshlink_errno_t meshlink_errno);
+void handle_duplicate_node(meshlink_handle_t *mesh, struct node_t *n);
+void handle_network_change(meshlink_handle_t *mesh, bool online);
+void call_error_cb(meshlink_handle_t *mesh, meshlink_errno_t meshlink_errno);
 
 /// Per-instance PRNG
 static inline int prng(meshlink_handle_t *mesh, uint64_t max) {