X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmeshlink_internal.h;h=f324c10645b556cc20760b3d9227691341e05a0b;hb=ce4dfa68147745b116ee316b012653b11a328cd9;hp=6aa871717563e8ea07cf813fd9a5be11fddfae89;hpb=529b8fab8c21e7ae5af91d742ff202eab38e51f3;p=meshlink

diff --git a/src/meshlink_internal.h b/src/meshlink_internal.h
index 6aa87171..f324c106 100644
--- a/src/meshlink_internal.h
+++ b/src/meshlink_internal.h
@@ -55,7 +55,6 @@ typedef struct listen_socket_t {
 	struct io_t udp;
 	sockaddr_t sa;
 	sockaddr_t broadcast_sa;
-	bool bindto;
 } listen_socket_t;
 
 typedef enum proxytype_t {
@@ -100,6 +99,7 @@ struct meshlink_handle {
 	struct node_t *self;
 	meshlink_log_cb_t log_cb;
 	meshlink_log_level_t log_level;
+	void *packet;
 
 	// The most important network-related members come first
 	int reachable;
@@ -128,7 +128,6 @@ struct meshlink_handle {
 	int contradicting_del_edge;
 	int sleeptime;
 	time_t connection_burst_time;
-	time_t last_config_check;
 	time_t last_hard_try;
 	time_t last_unreachable;
 	timeout_t pingtimer;
@@ -168,12 +167,14 @@ struct meshlink_handle {
 
 	bool default_blacklist;
 	bool discovery;         // Whether Catta is enabled or not
-
+	bool inviter_commits_first;
 
 	// Configuration
 	char *confbase;
 	FILE *lockfile;
 	void *config_key;
+	char *external_address_url;
+	struct list_t *invitation_addresses;
 
 	// Thread management
 	pthread_t thread;
@@ -192,17 +193,6 @@ struct meshlink_handle {
 	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;
@@ -270,6 +260,6 @@ static inline int prng(meshlink_handle_t *mesh, uint64_t max) {
 }
 
 /// Fudge value of ~0.1 seconds, in microseconds.
-static const unsigned int TIMER_FUDGE = 0x20000;
+static const unsigned int TIMER_FUDGE = 0x8000000;
 
 #endif