X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.h;h=830fe43a547ee44214cc55560f60afbe9013404a;hp=7dae41937eb5859cc6587f9a23dd0a63becd50ec;hb=92387475ace9b06af39987c71ac563cf29427009;hpb=ca6abd41ea0cdf2ca6491c3945fb3c62fd40ab98

diff --git a/src/net.h b/src/net.h
index 7dae4193..830fe43a 100644
--- a/src/net.h
+++ b/src/net.h
@@ -28,9 +28,6 @@
 #define MAXSIZE 1700  /* should be a bit more than the MTU for the tapdevice */
 #define MTU 1600
 
-#define MAX_PASSPHRASE_SIZE 2000 /* 2kb is really waaaay too much. nobody's
-				    gonna need a 16 kbit passphrase */
-
 #define MAC_ADDR_S "%02x:%02x:%02x:%02x:%02x:%02x"
 #define MAC_ADDR_V(x) ((unsigned char*)&(x))[0],((unsigned char*)&(x))[1], \
                       ((unsigned char*)&(x))[2],((unsigned char*)&(x))[3], \
@@ -64,7 +61,7 @@ typedef struct real_packet_t {
 
 typedef struct passphrase_t {
   unsigned short len;
-  unsigned char phrase[MAX_PASSPHRASE_SIZE];
+  unsigned char *phrase;
 } passphrase_t;
 
 typedef struct status_bits_t {
@@ -109,14 +106,15 @@ typedef struct conn_list_t {
   int meta_socket;                 /* our tcp meta socket */
   int protocol_version;            /* used protocol */
   status_bits_t status;            /* status info */
-  unsigned char *pp;               /* encoded passphrase */
+  passphrase_t *pp;                /* encoded passphrase */
   packet_queue_t *sq;              /* pending outgoing packets */
   packet_queue_t *rq;              /* pending incoming packets (they have no
 				      valid key to be decrypted with) */
   enc_key_t *public_key;           /* the other party's public key */
   enc_key_t *key;                  /* encrypt with this key */
-  char buffer[MAXBUFSIZE];         /* metadata input buffer */
+  char buffer[MAXBUFSIZE+1];       /* metadata input buffer */
   int buflen;                      /* bytes read into buffer */
+  int reqlen;                      /* length of first request in buffer */
   struct conn_list_t *nexthop;     /* nearest meta-hop in this direction */
   struct conn_list_t *next;        /* after all, it's a list of connections */
 } conn_list_t;