X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.h;h=8ff07088302ba08fc0067ce238bad679a46169ae;hb=f31267783fccb4e17d914c64243b0cba4e5632c4;hp=afefa17b683e9031c443de3f9b39fda67624965d;hpb=f79cc0e0bba16a3aa42a5fa13098cda714623205;p=meshlink

diff --git a/src/net.h b/src/net.h
index afefa17b..8ff07088 100644
--- a/src/net.h
+++ b/src/net.h
@@ -36,10 +36,8 @@
 #define MAXBUFSIZE ((MAXSIZE > 2048 ? MAXSIZE : 2048) + 128)
 
 typedef struct vpn_packet_t {
-	struct {
-		unsigned int probe: 1;
-		unsigned int tcp: 1;
-	};
+	uint16_t probe: 1;
+	int16_t tcp: 1;
 	uint16_t len;           /* the actual number of bytes in the `data' field */
 	uint8_t data[MAXSIZE];
 } vpn_packet_t;
@@ -59,28 +57,28 @@ typedef enum packet_type_t {
 #include "list.h"
 
 typedef struct outgoing_t {
-	char *name;
+	struct node_t *node;
+	enum {
+		OUTGOING_START,
+		OUTGOING_CANONICAL,
+		OUTGOING_RECENT,
+		OUTGOING_KNOWN,
+		OUTGOING_END,
+		OUTGOING_NO_KNOWN_ADDRESSES,
+	} state;
 	int timeout;
-	struct splay_tree_t *config_tree;
-	struct config_t *cfg;
-	struct addrinfo *ai; // addresses from config files
-	struct addrinfo *aip;
-	struct addrinfo *nai; // addresses known via other online nodes (use free_known_addresses())
 	timeout_t ev;
-	struct meshlink_handle *mesh;
+	struct addrinfo *ai;
+	struct addrinfo *aip;
 } outgoing_t;
 
-extern int maxoutbufsize;
-extern int addressfamily;
-
-extern int keylifetime;
-extern int max_connection_burst;
-extern bool do_prune;
-
 /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
 #include "connection.h"
 #include "node.h"
 
+extern void init_outgoings(struct meshlink_handle *mesh);
+extern void exit_outgoings(struct meshlink_handle *mesh);
+
 extern void retry_outgoing(struct meshlink_handle *mesh, outgoing_t *);
 extern void handle_incoming_vpn_data(struct event_loop_t *loop, void *, int);
 extern void finish_connecting(struct meshlink_handle *mesh, struct connection_t *);
@@ -97,21 +95,20 @@ extern void load_all_nodes(struct meshlink_handle *mesh);
 extern bool setup_myself_reloadable(struct meshlink_handle *mesh);
 extern bool setup_network(struct meshlink_handle *mesh);
 extern void setup_outgoing_connection(struct meshlink_handle *mesh, struct outgoing_t *);
-extern void try_outgoing_connections(struct meshlink_handle *mesh);
 extern void close_network_connections(struct meshlink_handle *mesh);
 extern int main_loop(struct meshlink_handle *mesh);
 extern void terminate_connection(struct meshlink_handle *mesh, struct connection_t *, bool);
-extern bool node_read_ecdsa_public_key(struct meshlink_handle *mesh, struct node_t *);
+extern bool node_read_public_key(struct meshlink_handle *mesh, struct node_t *);
+extern bool node_read_from_config(struct meshlink_handle *mesh, struct node_t *, const config_t *config);
 extern bool read_ecdsa_public_key(struct meshlink_handle *mesh, struct connection_t *);
 extern bool read_ecdsa_private_key(struct meshlink_handle *mesh);
+extern bool node_write_config(struct meshlink_handle *mesh, struct node_t *);
 extern void send_mtu_probe(struct meshlink_handle *mesh, struct node_t *);
 extern void handle_meta_connection_data(struct meshlink_handle *mesh, struct connection_t *);
 extern void retry(struct meshlink_handle *mesh);
 
 #ifndef HAVE_MINGW
 #define closesocket(s) close(s)
-#else
-extern CRITICAL_SECTION mutex;
 #endif
 
 #endif