- Updated subnet list handling. Subnets are added to two lists now, the

[tinc] / src / connlist.h

diff --git a/src/connlist.h b/src/connlist.h
index 7ded0bf..3ea64ee 100644 (file)
--- a/src/connlist.h
+++ b/src/connlist.h
@@ -17,20 +17,21 @@
     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.5 2000/10/28 16:41:37 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 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 */
@@ -43,9 +44,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 +52,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 */
@@ -72,9 +70,14 @@ typedef struct conn_list_t {
 
   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;
 
@@ -82,9 +85,8 @@ 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 conn_list_t *lookup_id(char *);
 extern void dump_conn_list(void);
+extern int read_host_config(conn_list_t *);
 
 #endif /* __TINC_CONNLIST_H__ */