Alter debugging levels through control socket

[tinc] / src / connection.h

diff --git a/src/connection.h b/src/connection.h
index e5cd689..ddff03b 100644 (file)
--- a/src/connection.h
+++ b/src/connection.h
@@ -23,12 +23,11 @@
 #ifndef __TINC_CONNECTION_H__
 #define __TINC_CONNECTION_H__
 
-//#include <openssl/rsa.h>
+#include <openssl/rsa.h>
 #include <openssl/evp.h>
 
 #include <event.h>
 
-#include "rsa.h"
 #include "splay_tree.h"
 
 #define OPTION_INDIRECT                0x0001
@@ -73,8 +72,7 @@ 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 */
-       struct rsa_key_t rsa_key;          /* his public/private key */
+       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 */
@@ -111,7 +109,7 @@ extern connection_t *new_connection(void) __attribute__ ((__malloc__));
 extern void free_connection(connection_t *);
 extern void connection_add(connection_t *);
 extern void connection_del(connection_t *);
-extern void dump_connections(void);
+extern int dump_connections(struct evbuffer *);
 extern bool read_connection_config(connection_t *);
 
 #endif                                                 /* __TINC_CONNECTION_H__ */