X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=4851649272eea53c9340110e9cf162dcf9af204a;hp=93c8be19bdca32973f254c81eb9c676d29d89c49;hb=1401faf608e1c8af0d0754e545b0ec79d2bd5d93;hpb=8d472a415e9c5fdb878386005d29cdfd97b8a404

diff --git a/src/net.h b/src/net.h
index 93c8be19..48516492 100644
--- a/src/net.h
+++ b/src/net.h
@@ -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.55 2002/09/15 12:26:24 guus Exp $
+    $Id: net.h,v 1.9.4.60 2003/07/06 23:16:28 guus Exp $
 */
 
 #ifndef __TINC_NET_H__
@@ -29,6 +29,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/time.h>
+#include <openssl/evp.h>
 
 #ifdef HAVE_INTTYPES_H
 #include <inttypes.h>
@@ -36,14 +37,13 @@
 
 #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 */
@@ -70,13 +70,19 @@ typedef short length_t;
 typedef union {
 	struct sockaddr sa;
 	struct sockaddr_in in;
+#ifdef HAVE_STRUCT_SOCKADDR_IN6
 	struct sockaddr_in6 in6;
+#endif
 } sockaddr_t;
 
 #ifdef SA_LEN
 #define SALEN(s) SA_LEN(&s)
 #else
+#ifdef HAVE_STRUCT_SOCKADDR_IN6
 #define SALEN(s) (s.sa_family==AF_INET?sizeof(struct sockaddr_in):sizeof(struct sockaddr_in6))
+#else
+#define SALEN(s) (sizeof sockaddr_in)
+#endif
 #endif
 
 typedef struct vpn_packet_t {
@@ -115,9 +121,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];
@@ -128,6 +131,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);
@@ -137,7 +141,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);