--- gvpe/src/global.h	2005/04/26 00:55:56	1.20
+++ gvpe/src/global.h	2007/12/02 00:45:42	1.22
@@ -49,28 +49,27 @@
 #define DIGEST		ENABLE_DIGEST ()
 #define HMAC_KEYLEN	(256 >> 3)	// number of bits used for the HMAC key (also change CHG_HMAC_KEY)
 
-#define MAX_SEQNO	0xfffffff0U
+#define WINDOWSIZE	512		// sliding window size
+#define MAX_SEQNO	(0xfffffff0U - WINDOWSIZE * 8)
 
 #define CHG_SEQNO	 0	// where the seqno starts within the rsa challenge
 #define CHG_CIPHER_KEY	 4	// where the key starts within the rsa challenge
 #define CHG_HMAC_KEY	86	// where the key starts within the rsa challenge (256 bits at the end!)
 
-//                   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 (wrong, but don't care)
-#define TCP_OVERHEAD (IP_OVERHEAD + 22)	// size of a (normal) ip + tcp header + packetlength
-#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
+//                    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 (wrong, but don't care)
+#define TCP_OVERHEAD  (IP_OVERHEAD + 22)	// size of a (normal) ip + tcp header + packetlength
+#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 5			// 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)
-
-#define WINDOWSIZE 512			// sliding window size
+#define QUEUEDEPTH	16	// the number of packets that will be queued (should be low)
 
 extern char *confbase;		// directory in which all config files are
 extern char *thisnode;		// config for current node (TODO: remove)