X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.h;h=d69eabdacab702624afbedcf8c4e21944f9eb746;hb=7ee885a1f6776be85e5397eda04f75d98ff0b631;hp=a4346445dffc3b73773bc9b659ef7761d1eba2e8;hpb=42d2dff33306beae8ddbd9cc991ad80f135950a6;p=tinc

diff --git a/src/net.h b/src/net.h
index a4346445..d69eabda 100644
--- a/src/net.h
+++ b/src/net.h
@@ -74,9 +74,6 @@ typedef union sockaddr_t {
 	struct sockaddr_in in;
 	struct sockaddr_in6 in6;
 	struct sockaddr_unknown unknown;
-#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
-	struct sockaddr_storage storage;
-#endif
 } sockaddr_t;
 
 #ifdef SA_LEN
@@ -122,13 +119,9 @@ typedef struct listen_socket_t {
 #include "list.h"
 
 typedef struct outgoing_t {
-	char *name;
+	struct node_t *node;
 	int timeout;
-	splay_tree_t *config_tree;
-	struct config_t *cfg;
-	struct addrinfo *ai;  // addresses from config files
-	struct addrinfo *aip;
-	struct addrinfo *kai; // addresses known via other online nodes (use free_known_addresses())
+	struct address_cache_t *address_cache;
 	timeout_t ev;
 } outgoing_t;
 
@@ -155,6 +148,7 @@ extern int keylifetime;
 extern int udp_rcvbuf;
 extern int udp_sndbuf;
 extern int max_connection_burst;
+extern int fwmark;
 extern bool do_prune;
 extern char *myport;
 extern bool device_standby;