Increase MTU by 4 bytes to allow VLAN tagged Ethernet frames in hub and switch mode.

[tinc] / src / net.h

diff --git a/src/net.h b/src/net.h
index 90463eb..b5692ef 100644 (file)
--- 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.73 2003/12/20 19:47:52 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 */
@@ -122,7 +122,6 @@ extern listen_socket_t listen_socket[MAXSOCKETS];
 extern int listen_sockets;
 extern int keyexpires;
 extern int keylifetime;
-extern bool strictsource;
 extern bool do_prune;
 extern bool do_purge;
 extern char *myport;