Merge branch 'master' into 1.1

[meshlink] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index ddff03bbd7a7081510b3717aba08dee9d8f1d71a..e44af0b06a2412c9c021114dac35985404b48c40 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -23,19 +23,16 @@
 #ifndef __TINC_CONNECTION_H__
 #define __TINC_CONNECTION_H__
 
-#include <openssl/rsa.h>
-#include <openssl/evp.h>
-
-#include <event.h>
-
+#include "cipher.h"
+#include "digest.h"
+#include "rsa.h"
 #include "splay_tree.h"
 
 #define OPTION_INDIRECT                0x0001
 #define OPTION_TCPONLY         0x0002
 #define OPTION_PMTU_DISCOVERY  0x0004
 
-typedef union connection_status_t {
-       struct {
+typedef struct connection_status_t {
                int pinged:1;                           /* sent ping */
                int active:1;                           /* 1 if active.. */
                int connecting:1;                       /* 1 if we are waiting for a non-blocking connect() to finish */
@@ -46,8 +43,6 @@ typedef union connection_status_t {
                int decryptin:1;                        /* 1 if we have to decrypt incoming traffic */
                int mst:1;                              /* 1 if this connection is part of a minimum spanning tree */
                int unused:23;
-       };
-       uint32_t value;
 } connection_status_t;
 
 #include "edge.h"
@@ -72,23 +67,18 @@ typedef struct connection_t {
        struct node_t *node;            /* node associated with the other end */
        struct edge_t *edge;            /* edge associated with this connection */
 
-       RSA *rsa_key;                           /* his public/private key */
-       const EVP_CIPHER *incipher;     /* Cipher he will use to send data to us */
-       const EVP_CIPHER *outcipher;    /* Cipher we will use to send data to him */
-       EVP_CIPHER_CTX *inctx;          /* Context of encrypted meta data that will come from him to us */
-       EVP_CIPHER_CTX *outctx;         /* Context of encrypted meta data that will be sent from us to him */
-       char *inkey;                            /* His symmetric meta key + iv */
-       char *outkey;                           /* Our symmetric meta key + iv */
-       int inkeylength;                        /* Length of his key + iv */
-       int outkeylength;                       /* Length of our key + iv */
-       const EVP_MD *indigest;
-       const EVP_MD *outdigest;
+       rsa_t rsa;                      /* his public/private key */
+       cipher_t incipher;              /* Cipher he will use to send data to us */
+       cipher_t outcipher;             /* Cipher we will use to send data to him */
+       digest_t indigest;
+       digest_t outdigest;
+
        int inmaclength;
        int outmaclength;
        int incompression;
        int outcompression;
-       char *mychallenge;                      /* challenge we received from him */
-       char *hischallenge;                     /* challenge we sent to him */
+
+       char *hischallenge;             /* The challenge we sent to him */
 
        struct bufferevent *buffer;                     /* buffer events on this metadata connection */
        struct event inevent;                           /* input event on this metadata connection */