#include "meshlink_queue.h"
#include "sockaddr.h"
#include "sptps.h"
+#include "xoshiro.h"
#include <pthread.h>
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;
struct io_t tcp;
struct io_t udp;
sockaddr_t sa;
+ sockaddr_t broadcast_sa;
bool bindto;
} listen_socket_t;
typedef struct {
int pinginterval;
int pingtimeout;
+ int fast_retry_period;
unsigned int min_connects;
unsigned int max_connects;
int edge_weight;
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];
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];
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;
bool default_blacklist;
bool discovery; // Whether Catta is enabled or not
-
+ bool inviter_commits_first;
// Configuration
char *confbase;
- FILE *conffile;
+ FILE *lockfile;
void *config_key;
// Thread management
char *catta_servicetype;
unsigned int catta_interfaces;
- // State used for meshlink_join()
- int sock;
- char cookie[18], hash[18];
- bool success;
- sptps_t sptps;
- char *data;
- size_t thedatalen;
- size_t blen;
- char line[4096];
- char buffer[4096];
-
// Proxy configuration, currently not exposed.
char *proxyhost;
char *proxyport;
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