projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This subtle pointer arithmetic thingy is (I'm very sure of it) the cause
[tinc]
/
src
/
net.h
diff --git
a/src/net.h
b/src/net.h
index
93c8be1
..
ae38402
100644
(file)
--- 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.
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.5
5 2002/09/15 12:26:24
guus Exp $
+ $Id: net.h,v 1.9.4.5
8 2003/05/07 11:21:58
guus Exp $
*/
#ifndef __TINC_NET_H__
*/
#ifndef __TINC_NET_H__
@@
-29,6
+29,7
@@
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/time.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <sys/time.h>
+#include <openssl/evp.h>
#ifdef HAVE_INTTYPES_H
#include <inttypes.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 */
#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 */
#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
#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 */
#define MAXSOCKETS 128 /* Overkill... */
#define MAXQUEUELENGTH 8 /* Maximum number of packats in a single queue */
@@
-128,6
+128,7
@@
extern int do_prune;
extern int do_purge;
extern char *myport;
extern time_t now;
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);
extern void retry_outgoing(outgoing_t *);
extern void handle_incoming_vpn_data(int);