X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnlist.h;h=2d66289a247a44ad9052ea4ff25e8f55b9a62a57;hp=ee91aeaf37776de060c0b166d6b620e2b518a383;hb=afc05797077641baa33b024ffeaafd6cad3ff7a7;hpb=35932fe6c8cb481eb687f98424776ce429570c21

diff --git a/src/connlist.h b/src/connlist.h
index ee91aeaf..2d66289a 100644
--- 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.12 2000/11/04 20:44:26 guus Exp $
 */
 
 #ifndef __TINC_CONNLIST_H__
@@ -29,13 +29,33 @@
 #include "net.h"
 #include "conf.h"
 
+typedef struct status_bits_t {
+  int pinged:1;                    /* sent ping */
+  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 */
   char *hostname;                  /* the hostname of its real ip */
   short unsigned int port;         /* his portnumber */
   int protocol_version;            /* used protocol */
-  long int options;                /* options turned on for this connection */
+  long unsigned int options;       /* options turned on for this connection */
 
   int flags;                       /* his flags */
   int socket;                      /* our udp vpn socket */
@@ -48,10 +68,12 @@ 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 */
+  char *cipher_inkey;              /* His symmetric meta key */
+  char *cipher_outkey;             /* Our symmetric meta key */
 
-  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 */
@@ -59,7 +81,6 @@ typedef struct conn_list_t {
   int allow_request;               /* defined if there's only one request possible */
 
   time_t last_ping_time;           /* last time we saw some activity from the other end */  
-  int want_ping;                   /* 0 if there's no need to check for activity. Shouldn't this go into status? (GS) */
 
   char *mychallenge;               /* challenge we received from him */
   char *hischallenge;              /* challenge we sent to him */
@@ -86,5 +107,7 @@ extern void conn_list_del(conn_list_t *);
 extern conn_list_t *lookup_id(char *);
 extern void dump_conn_list(void);
 extern int read_host_config(conn_list_t *);
+extern void destroy_conn_list(void);
+extern void prune_conn_list(void);
 
 #endif /* __TINC_CONNLIST_H__ */