X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fmeshlink_internal.h;h=6aa871717563e8ea07cf813fd9a5be11fddfae89;hp=a856180686de947c494e164ab47252a58aafb4cd;hb=902446edf822a32383c4fa4b7c13b83a568095ad;hpb=9457a9cdb66473ad36923845b0f5fb359eec2ef0

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index a8561806..6aa87171 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -32,6 +32,7 @@
 #include "meshlink_queue.h"
 #include "sockaddr.h"
 #include "sptps.h"
+#include "xoshiro.h"
 
 #include <pthread.h>
 
@@ -41,8 +42,8 @@ static const char meshlink_invitation_label[] = "MeshLink invitation";
 static const char meshlink_tcp_label[] = "MeshLink TCP";
 static const char meshlink_udp_label[] = "MeshLink UDP";
 
-#define MESHLINK_CONFIG_VERSION 1
-#define MESHLINK_INVITATION_VERSION 1
+#define MESHLINK_CONFIG_VERSION 2
+#define MESHLINK_INVITATION_VERSION 2
 
 struct CattaServer;
 struct CattaSServiceBrowser;
@@ -53,6 +54,7 @@ typedef struct listen_socket_t {
 	struct io_t tcp;
 	struct io_t udp;
 	sockaddr_t sa;
+	sockaddr_t broadcast_sa;
 	bool bindto;
 } listen_socket_t;
 
@@ -80,6 +82,7 @@ struct meshlink_open_params {
 typedef struct {
 	int pinginterval;
 	int pingtimeout;
+	int fast_retry_period;
 	unsigned int min_connects;
 	unsigned int max_connects;
 	int edge_weight;
@@ -92,13 +95,14 @@ struct meshlink_handle {
 	void *priv;
 
 	// private members
-	pthread_mutex_t mesh_mutex;
+	pthread_mutex_t mutex;
 	event_loop_t loop;
 	struct node_t *self;
 	meshlink_log_cb_t log_cb;
 	meshlink_log_level_t log_level;
 
 	// The most important network-related members come first
+	int reachable;
 	int listen_sockets;
 	listen_socket_t listen_socket[MAXSOCKETS];
 
@@ -126,10 +130,13 @@ struct meshlink_handle {
 	time_t connection_burst_time;
 	time_t last_config_check;
 	time_t last_hard_try;
+	time_t last_unreachable;
 	timeout_t pingtimer;
 	timeout_t periodictimer;
 
 	struct connection_t *everyone;
+	uint64_t prng_state[4];
+	uint32_t session_id;
 
 	int next_pit;
 	int pits[10];
@@ -140,6 +147,7 @@ struct meshlink_handle {
 	meshlink_channel_accept_cb_t channel_accept_cb;
 	meshlink_node_duplicate_cb_t node_duplicate_cb;
 	meshlink_connection_try_cb_t connection_try_cb;
+	meshlink_error_cb_t error_cb;
 
 	// Mesh parameters
 	char *appname;
@@ -164,7 +172,7 @@ struct meshlink_handle {
 
 	// Configuration
 	char *confbase;
-	FILE *conffile;
+	FILE *lockfile;
 	void *config_key;
 
 	// Thread management
@@ -254,5 +262,14 @@ 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);
+
+/// Per-instance PRNG
+static inline int prng(meshlink_handle_t *mesh, uint64_t max) {
+	return xoshiro(mesh->prng_state) % max;
+}
+
+/// Fudge value of ~0.1 seconds, in microseconds.
+static const unsigned int TIMER_FUDGE = 0x20000;
 
 #endif