Fixed meta protocol.

[tinc] / src / net.h

diff --git a/src/net.h b/src/net.h
index 93b8c31..27a16cf 100644 (file)
--- 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], \
@@ -46,6 +43,8 @@
                       ((unsigned char*)&(x))[1],((unsigned char*)&(x))[0]
 #endif
 
+#define MAXBUFSIZE 2048 /* Probably way too much, but it must fit every possible request. */
+
 typedef unsigned long ip_t;
 typedef short length_t;
 
@@ -61,10 +60,8 @@ typedef struct real_packet_t {
 } real_packet_t;
 
 typedef struct passphrase_t {
-  unsigned char type;
-  char unused1;
   unsigned short len;
-  unsigned char phrase[MAX_PASSPHRASE_SIZE];
+  unsigned char *phrase;
 } passphrase_t;
 
 typedef struct status_bits_t {
@@ -104,10 +101,10 @@ typedef struct conn_list_t {
   ip_t vpn_mask;                   /* his vpn network address */
   ip_t real_ip;                    /* his real (internet) ip */
   char *hostname;                  /* the hostname of its real ip */
-  short int port;                  /* his portnumber */
+  short unsigned int port;         /* his portnumber */
   int socket;                      /* our udp vpn socket */
   int meta_socket;                 /* our tcp meta socket */
-  unsigned char protocol_version;  /* used protocol */
+  int protocol_version;            /* used protocol */
   status_bits_t status;            /* status info */
   passphrase_t *pp;                /* encoded passphrase */
   packet_queue_t *sq;              /* pending outgoing packets */
@@ -115,6 +112,8 @@ typedef struct conn_list_t {
                                      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 */
+  int buflen;                      /* bytes read into 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;