X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=b82ca830c98eb273fb79a7f86badbb189a388e6f;hp=06c0504c0632eb55aef28cfc8691a246e1f5e793;hb=4fe7aff4d1b8605d4997b842481cc78bd062fe2a;hpb=f08fc359a0b7f638e73a8f866119b016b7dff8de

diff --git a/src/net.h b/src/net.h
index 06c0504c..b82ca830 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-2004 Ivo Timmermans <zarq@iname.com>
+                  2000-2004 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
@@ -17,7 +17,7 @@
     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.9.4.69 2003/08/02 20:50:38 guus Exp $
+    $Id$
 */
 
 #ifndef __TINC_NET_H__
@@ -28,9 +28,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 */
@@ -54,10 +54,21 @@ typedef struct ipv6_t {
 
 typedef short length_t;
 
+#define AF_UNKNOWN 255
+
+struct sockaddr_unknown {
+	uint16_t family;
+	uint16_t pad1;
+	uint32_t pad2;
+	char *address;
+	char *port;
+};
+
 typedef union sockaddr_t {
 	struct sockaddr sa;
 	struct sockaddr_in in;
 	struct sockaddr_in6 in6;
+	struct sockaddr_unknown unknown;
 #ifdef HAVE_STRUCT_SOCKADDR_STORAGE
 	struct sockaddr_storage storage;
 #endif
@@ -106,6 +117,7 @@ typedef struct outgoing_t {
 extern int maxtimeout;
 extern int seconds_till_retry;
 extern int addressfamily;
+extern bool blockingtcp;
 
 extern listen_socket_t listen_socket[MAXSOCKETS];
 extern int listen_sockets;
@@ -139,6 +151,7 @@ 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)