X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnlist.h;h=d3b2ce30c0e2abac2ea1f8f6d8a10d5f2e94bbc1;hp=7ded0bfac85978c75b207458da743ba151e0aee2;hb=e8391bd49975aa29fa62d6ae1d2d2ee398e0eb3e;hpb=950fb8e916b0e248dcaa72c96859acd6046683aa

diff --git a/src/connlist.h b/src/connlist.h
index 7ded0bfa..d3b2ce30 100644
--- a/src/connlist.h
+++ b/src/connlist.h
@@ -17,24 +17,46 @@
     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.1 2000/10/11 10:35:15 guus Exp $
+    $Id: connlist.h,v 1.1.2.7 2000/10/29 01:27:23 guus Exp $
 */
 
 #ifndef __TINC_CONNLIST_H__
 #define __TINC_CONNLIST_H__
 
 #include <openssl/evp.h>
+#include <openssl/rsa.h>
 
 #include "net.h"
-#include "subnet.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 */
-  ip_t real_ip;                    /* his real (internet) ip */
+  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 */
-  int options;                     /* options turned on for this connection */
+  long int options;                /* options turned on for this connection */
 
   int flags;                       /* his flags */
   int socket;                      /* our udp vpn socket */
@@ -43,9 +65,7 @@ typedef struct conn_list_t {
   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 *datakey;              /* encrypt data packets with this key */
-  enc_key_t *rsakey;
+  RSA *rsa_key;                    /* the public/private key */
 
   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 */
@@ -53,7 +73,6 @@ typedef struct conn_list_t {
   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_pktiv;              /* Cipher input vector */
 
   char *buffer;                    /* metadata input buffer */
   int buflen;                      /* bytes read into buffer */
@@ -66,25 +85,27 @@ typedef struct conn_list_t {
   char *mychallenge;               /* challenge we received from him */
   char *hischallenge;              /* challenge we sent to him */
 
-  struct conn_list_t *nexthop;     /* nearest meta-hop in this direction, will be changed to myuplink (GS) */
-  struct conn_list_t *hisuplink;   /* his nearest meta-hop in our direction */
-  struct conn_list_t *myuplink;    /* our nearest meta-hop in his direction */
-
+  struct conn_list_t *nexthop;     /* nearest meta-hop in this direction */
+  
   struct subnet_t *subnets;        /* Pointer to a list of subnets belonging to this connection */
 
+  struct config_t *config;         /* Pointer to configuration tree belonging to this host */
+
   struct conn_list_t *next;        /* after all, it's a list of connections */
+  struct conn_list_t *prev;        /* doubly linked for O(1) deletions */
 } conn_list_t;
 
+#include "subnet.h"
+
 extern conn_list_t *conn_list;
 extern conn_list_t *myself;
 
 extern conn_list_t *new_conn_list();
 extern void free_conn_list(conn_list_t *);
-extern void add_conn_list(conn_list_t *);
-extern void del_conn_list(conn_list_t *);
-extern conn_list_t *lookup_conn_list_mac(mac_t);
-extern conn_list_t *lookup_conn_list_ipv4(ipv4_t);
-extern conn_list_t *lookup_conn_list_ipv6(ipv6_t);
+extern void conn_list_add(conn_list_t *);
+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 *);
 
 #endif /* __TINC_CONNLIST_H__ */