- Use CFB mode for encrypting packets: it works and we don't need padding.

[tinc] / src / connlist.h

diff --git a/src/connlist.h b/src/connlist.h
index ee91aea..d993c84 100644 (file)
--- a/src/connlist.h
+++ b/src/connlist.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: connlist.h,v 1.1.2.6 2000/10/29 00:02:18 guus Exp $
+    $Id: connlist.h,v 1.1.2.8 2000/10/29 22:10:41 guus Exp $
 */
 
 #ifndef __TINC_CONNLIST_H__
@@ -29,6 +29,27 @@
 #include "net.h"
 #include "conf.h"
 
+typedef struct status_bits_t {
+  int pinged:1;                    /* sent ping */
+  int got_pong:1;                  /* received pong */
+  int meta:1;                      /* meta connection exists */
+  int active:1;                    /* 1 if active.. */
+  int outgoing:1;                  /* I myself asked for this conn */
+  int termreq:1;                   /* the termination of this connection was requested */
+  int remove:1;                    /* Set to 1 if you want this connection removed */
+  int timeout:1;                   /* 1 if gotten timeout */
+  int validkey:1;                  /* 1 if we currently have a valid key for him */
+  int waitingforkey:1;             /* 1 if we already sent out a request */
+  int dataopen:1;                  /* 1 if we have a valid UDP connection open */
+  int encryptout:1;               /* 1 if we can encrypt outgoing traffic */
+  int decryptin:1;                 /* 1 if we have to decrypt incoming traffic */
+  int unused:18;
+} status_bits_t;
+
+typedef struct option_bits_t {
+  int unused:32;
+} option_bits_t;
+
 typedef struct conn_list_t {
   char *name;                      /* name of this connection */
   ipv4_t address;                  /* his real (internet) ip */
@@ -49,9 +70,9 @@ typedef struct conn_list_t {
   EVP_CIPHER_CTX *cipher_inctx;    /* Context of encrypted meta data that will come from him to us */
   EVP_CIPHER_CTX *cipher_outctx;   /* Context of encrypted meta data that will be sent from us to him */
 
-  EVP_CIPHER_CTX *cipher_pktctx;   /* Context of encrypted vpn packets that will be sent to him */
   EVP_CIPHER *cipher_pkttype;      /* Cipher type for encrypted vpn packets */ 
-  char *cipher_pktkey;             /* Cipher key */
+  char *cipher_pktkey;             /* Cipher key and iv */
+  int cipher_pktkeylength;         /* Cipher key and iv length*/
 
   char *buffer;                    /* metadata input buffer */
   int buflen;                      /* bytes read into buffer */