--- gvpe/src/global.h	2003/04/02 03:06:22	1.8
+++ gvpe/src/global.h	2003/10/16 02:41:21	1.15
@@ -1,5 +1,6 @@
 /*
     global.h -- global variables and constants
+    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
  
     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
@@ -28,7 +29,7 @@
  */
 
 #define PROTOCOL_MAJOR 0
-#define PROTOCOL_MINOR 0
+#define PROTOCOL_MINOR 1
 
 #define RSA_KEYBITS	1280		// must be >= 1280 and divisible by 8
 #define RSA_KEYLEN	((RSA_KEYBITS) >> 3)
@@ -39,7 +40,7 @@
 #define RSA_RESLEN	RSA_HASHLEN
 
 #define RSA_IDLEN	16		// how many bytes are used to identify the challenge
-#define RSA_TTL		20		// challenge bytes timeout after n seconds
+#define RSA_TTL		120		// challenge bytes timeout after n seconds
 
 #define CIPHER		ENABLE_CIPHER ()
 #define CIPHER_KEYLEN	(EVP_CIPHER_key_length (CIPHER))
@@ -55,12 +56,15 @@
 //                   hdr seq len              hmac        MAC MAC
 #define VPE_OVERHEAD (4 + 4 + 4 + RAND_SIZE + HMACLENGTH - 6 - 6)
 #define IP_OVERHEAD  20			// size of a (normal) ip header
+#define GRE_OVERHEAD (IP_OVERHEAD +  4)
+#define ICMP_OVERHEAD (IP_OVERHEAD + 4)
 #define UDP_OVERHEAD (IP_OVERHEAD + 20)	// size of a (normal) ip + udp header
-#define MAX_OVERHEAD UDP_OVERHEAD	// the max. overhead of any protocol
+#define TCP_OVERHEAD (IP_OVERHEAD + 22)	// size of a (normal) ip + tcp header + pakcetlength
+#define MAX_OVERHEAD UDP_OVERHEAD	// the max. overhead of any protocol (ok, tcp doesn't count)
 #define ETH_OVERHEAD 14			// the size of an ethernet header
 #define MAXSIZE (MAX_MTU + VPE_OVERHEAD)// slightly too large, but who cares
 
-#define PKTCACHESIZE 4			// the size of the memory pool for packets
+#define PKTCACHESIZE 5			// the size of the memory pool for packets
 
 #define QUEUEDEPTH 16			// the number of packets that will be queued (should be low)