X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.h;h=cf0ddc795312fc4e7eddcb88bf6aa2efa4fea2e1;hb=ba0a3bcb2d565eec26aed30eef902d3482877cf9;hp=a4346445dffc3b73773bc9b659ef7761d1eba2e8;hpb=42d2dff33306beae8ddbd9cc991ad80f135950a6;p=tinc

diff --git a/src/net.h b/src/net.h
index a4346445..cf0ddc79 100644
--- a/src/net.h
+++ b/src/net.h
@@ -56,7 +56,7 @@ typedef struct node_id_t {
 	uint8_t x[6];
 } node_id_t;
 
-typedef short length_t;
+typedef uint16_t length_t;
 typedef uint32_t seqno_t;
 
 #define AF_UNKNOWN 255
@@ -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,8 @@ 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())
 	timeout_t ev;
 } outgoing_t;
 
@@ -155,6 +147,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;
@@ -196,8 +189,8 @@ extern int setup_vpn_in_socket(const sockaddr_t *sa);
 extern bool send_sptps_data(node_t *to, node_t *from, int 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 node_t *n, vpn_packet_t *packet);
-extern void receive_tcppacket(struct connection_t *c, const char *buffer, int length);
-extern bool receive_tcppacket_sptps(struct connection_t *c, const char *buffer, int length);
+extern void receive_tcppacket(struct connection_t *c, const char *buffer, size_t length);
+extern bool receive_tcppacket_sptps(struct connection_t *c, const char *buffer, size_t length);
 extern void broadcast_packet(const struct node_t *n, vpn_packet_t *packet);
 extern char *get_name(void);
 extern void device_enable(void);
@@ -220,6 +213,7 @@ extern void retry(void);
 extern int reload_configuration(void);
 extern void load_all_nodes(void);
 extern void try_tx(struct node_t *n, bool mtu);
+extern void tarpit(int fd);
 
 #ifndef HAVE_MINGW
 #define closesocket(s) close(s)