X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet.h;h=cc84ce96035379b9d723ee63173502db4e9ca908;hb=ad87362afd13c4f14ce9a4b2cf0586a753b5a422;hp=1eed88d12aa166a1d3ff8bec9c9d891c2de66ce0;hpb=61d9b04f66055e61f0afdf8955ff890f4da39288;p=meshlink

diff --git a/src/net.h b/src/net.h
index 1eed88d1..cc84ce96 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;
-	};
+	unsigned int probe: 1;
+	unsigned int tcp: 1;
 	uint16_t len;           /* the actual number of bytes in the `data' field */
 	uint8_t data[MAXSIZE];
 } vpn_packet_t;
@@ -60,12 +58,19 @@ typedef enum packet_type_t {
 
 typedef struct outgoing_t {
 	char *name;
-	int timeout;
 	struct splay_tree_t *config_tree;
+	int timeout;
+	enum {
+		OUTGOING_START,
+		OUTGOING_CANONICAL,
+		OUTGOING_RECENT,
+		OUTGOING_KNOWN,
+		OUTGOING_END,
+		OUTGOING_NO_KNOWN_ADDRESSES,
+	} state;
 	struct config_t *cfg;
-	struct addrinfo *ai; // addresses from config files
+	struct addrinfo *ai;
 	struct addrinfo *aip;
-	struct addrinfo *nai; // addresses known via other online nodes (use free_known_addresses())
 	timeout_t ev;
 	struct meshlink_handle *mesh;
 } outgoing_t;
@@ -91,7 +96,6 @@ extern int setup_vpn_in_socket(struct meshlink_handle *mesh, const sockaddr_t *)
 extern bool send_sptps_data(void *handle, uint8_t type, const void *data, size_t len);
 extern bool receive_sptps_record(void *handle, uint8_t type, const void *data, uint16_t len);
 extern void send_packet(struct meshlink_handle *mesh, struct node_t *, struct vpn_packet_t *);
-extern void receive_tcppacket(struct meshlink_handle *mesh, struct connection_t *, const char *, int);
 extern void broadcast_packet(struct meshlink_handle *mesh, const struct node_t *, struct vpn_packet_t *);
 extern char *get_name(struct meshlink_handle *mesh);
 extern void load_all_nodes(struct meshlink_handle *mesh);
@@ -111,8 +115,6 @@ extern void retry(struct meshlink_handle *mesh);
 
 #ifndef HAVE_MINGW
 #define closesocket(s) close(s)
-#else
-extern CRITICAL_SECTION mutex;
 #endif
 
 #endif