X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=7dd311d3eaa04e874743892b6f4764bd9ed8c0a0;hp=092b9dc97f8f5c740b2c52ac31f2b07a6dc66786;hb=0e6856b1379e278aa5ed116d0911851339a6064c;hpb=013a2e159e42c46808ea8d0b6abd57525db30a50

diff --git a/src/net.h b/src/net.h
index 092b9dc9..7dd311d3 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1,7 +1,7 @@
 /*
     net.h -- header for net.c
-    Copyright (C) 1998-2003 Ivo Timmermans <zarq@iname.com>
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2005 Ivo Timmermans
+                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -16,8 +16,6 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: net.h,v 1.13 2003/08/24 20:38:24 guus Exp $
 */
 
 #ifndef __TINC_NET_H__
@@ -28,9 +26,9 @@
 #include "ipv6.h"
 
 #ifdef ENABLE_JUMBOGRAMS
-#define MTU 9014				/* 9000 bytes payload + 14 bytes ethernet header */
+#define MTU 9018				/* 9000 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */
 #else
-#define MTU 1514				/* 1500 bytes payload + 14 bytes ethernet header */
+#define MTU 1518				/* 1500 bytes payload + 14 bytes ethernet header + 4 bytes VLAN tag */
 #endif
 
 #define MAXSIZE (MTU + 4 + EVP_MAX_BLOCK_LENGTH + EVP_MAX_MD_SIZE + MTU/64 + 20)	/* MTU + seqno + padding + HMAC + compressor overhead */
@@ -38,8 +36,6 @@
 
 #define MAXSOCKETS 128			/* Overkill... */
 
-#define MAXQUEUELENGTH 8		/* Maximum number of packats in a single queue */
-
 typedef struct mac_t {
 	uint8_t x[6];
 } mac_t;
@@ -54,7 +50,7 @@ typedef struct ipv6_t {
 
 typedef short length_t;
 
-#define AF_UNKNOWN 0xFFFF
+#define AF_UNKNOWN 255
 
 struct sockaddr_unknown {
 	uint16_t family;
@@ -87,17 +83,6 @@ typedef struct vpn_packet_t {
 	uint8_t data[MAXSIZE];
 } vpn_packet_t;
 
-typedef struct queue_element_t {
-	void *packet;
-	struct queue_element_t *prev;
-	struct queue_element_t *next;
-} queue_element_t;
-
-typedef struct packet_queue_t {
-	queue_element_t *head;
-	queue_element_t *tail;
-} packet_queue_t;
-
 typedef struct listen_socket_t {
 	int tcp;
 	int udp;
@@ -105,6 +90,7 @@ typedef struct listen_socket_t {
 } listen_socket_t;
 
 #include "conf.h"
+#include "list.h"
 
 typedef struct outgoing_t {
 	char *name;
@@ -114,7 +100,9 @@ typedef struct outgoing_t {
 	struct addrinfo *aip;
 } outgoing_t;
 
-extern int maxtimeout;
+extern list_t *outgoing_list;
+
+extern int maxoutbufsize;
 extern int seconds_till_retry;
 extern int addressfamily;
 
@@ -126,7 +114,6 @@ extern bool do_prune;
 extern bool do_purge;
 extern char *myport;
 extern time_t now;
-extern EVP_CIPHER_CTX packet_ctx;
 
 /* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
 #include "connection.h"
@@ -142,7 +129,7 @@ extern int setup_vpn_in_socket(const sockaddr_t *);
 extern void send_packet(const struct node_t *, vpn_packet_t *);
 extern void receive_tcppacket(struct connection_t *, char *, int);
 extern void broadcast_packet(const struct node_t *, vpn_packet_t *);
-extern bool setup_network_connections(void);
+extern bool setup_network(void);
 extern void setup_outgoing_connection(struct outgoing_t *);
 extern void try_outgoing_connections(void);
 extern void close_network_connections(void);
@@ -150,9 +137,12 @@ extern int main_loop(void);
 extern void terminate_connection(struct connection_t *, bool);
 extern void flush_queue(struct node_t *);
 extern bool read_rsa_public_key(struct connection_t *);
+extern void send_mtu_probe(struct node_t *);
 
 #ifndef HAVE_MINGW
 #define closesocket(s) close(s)
+#else
+extern CRITICAL_SECTION mutex;
 #endif
 
 #endif							/* __TINC_NET_H__ */