X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=8ad89947cdcac72962407c523ce015181e096035;hp=490cdcf3794bf977703c38eb59c6d25b1dcec437;hb=4c52febc57f2e34f5a187f0e57782903fe1eb95e;hpb=eaf1208e9d5c5a15e4b23de936830520bf3b5685

diff --git a/src/net.h b/src/net.h
index 490cdcf3..8ad89947 100644
--- a/src/net.h
+++ b/src/net.h
@@ -1,7 +1,7 @@
 /*
     net.h -- header for net.c
-    Copyright (C) 1998-2002 Ivo Timmermans <zarq@iname.com>
-                  2000-2002 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1998-2003 Ivo Timmermans <zarq@iname.com>
+                  2000-2003 Guus Sliepen <guus@sliepen.eu.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.54 2002/09/10 22:12:33 guus Exp $
+    $Id: net.h,v 1.9.4.63 2003/07/12 17:41:46 guus Exp $
 */
 
 #ifndef __TINC_NET_H__
@@ -29,21 +29,23 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/time.h>
+#include <openssl/evp.h>
 
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
 #endif
 
+#include "utils.h"
+
 #ifdef ENABLE_JUMBOGRAMS
 #define MTU 9014				/* 9000 bytes payload + 14 bytes ethernet header */
-#define MAXSIZE 9100			/* MTU + header (seqno) and trailer (CBC padding and HMAC) */
-#define MAXBUFSIZE 9100			/* Must support TCP packets of length 9000. */
 #else
 #define MTU 1514				/* 1500 bytes payload + 14 bytes ethernet header */
-#define MAXSIZE 1600			/* MTU + header (seqno) and trailer (CBC padding and HMAC) */
-#define MAXBUFSIZE 2100			/* Quite large but needed for support of keys up to 8192 bits. */
 #endif
 
+#define MAXSIZE (MTU + 4 + EVP_MAX_BLOCK_LENGTH + EVP_MAX_MD_SIZE + MTU/64 + 20)	/* MTU + seqno + padding + HMAC + compressor overhead */
+#define MAXBUFSIZE ((MAXSIZE > 2048 ? MAXSIZE : 2048) + 128)	/* Enough room for a request with a MAXSIZEd packet or a 8192 bits RSA key */
+
 #define MAXSOCKETS 128			/* Overkill... */
 
 #define MAXQUEUELENGTH 8		/* Maximum number of packats in a single queue */
@@ -56,23 +58,19 @@ typedef struct ipv4_t {
 	uint8_t x[4];
 } ipv4_t;
 
-typedef struct ip_mask_t {
-	ipv4_t address;
-	ipv4_t mask;
-} ip_mask_t;
-
 typedef struct ipv6_t {
 	uint16_t x[8];
 } ipv6_t;
 
-typedef unsigned short port_t;
-
 typedef short length_t;
 
 typedef union {
 	struct sockaddr sa;
 	struct sockaddr_in in;
 	struct sockaddr_in6 in6;
+#ifdef HAVE_STRUCT_SOCKADDR_STORAGE
+	struct sockaddr_storage storage;
+#endif
 } sockaddr_t;
 
 #ifdef SA_LEN
@@ -117,9 +115,6 @@ extern int maxtimeout;
 extern int seconds_till_retry;
 extern int addressfamily;
 
-extern char *request_name[];
-extern char *status_text[];
-
 #include "connection.h"			/* Yes, very strange placement indeed, but otherwise the typedefs get all tangled up */
 
 extern listen_socket_t listen_socket[MAXSOCKETS];
@@ -130,6 +125,7 @@ extern int do_prune;
 extern int do_purge;
 extern char *myport;
 extern time_t now;
+extern EVP_CIPHER_CTX packet_ctx;
 
 extern void retry_outgoing(outgoing_t *);
 extern void handle_incoming_vpn_data(int);
@@ -139,7 +135,6 @@ extern int handle_new_meta_connection(int);
 extern int setup_listen_socket(sockaddr_t *);
 extern int setup_vpn_in_socket(sockaddr_t *);
 extern void send_packet(struct node_t *, vpn_packet_t *);
-extern void receive_packet(struct node_t *, vpn_packet_t *);
 extern void receive_tcppacket(struct connection_t *, char *, int);
 extern void broadcast_packet(struct node_t *, vpn_packet_t *);
 extern int setup_network_connections(void);