Remove unnecessary parentheses from sizeof, apply sizeof to variables instead of...

[tinc] / src / node.h

diff --git a/src/node.h b/src/node.h
index 83af5e3..fee6859 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -24,7 +24,9 @@
 #define __TINC_NODE_H__
 
 #include "splay_tree.h"
+#include "cipher.h"
 #include "connection.h"
+#include "digest.h"
 #include "list.h"
 #include "subnet.h"
 
@@ -50,13 +52,9 @@ typedef struct node_t {
 
        node_status_t status;
 
-       const EVP_CIPHER *cipher;               /* Cipher type for UDP packets */
-       char *key;                              /* Cipher key and iv */
-       int keylength;                          /* Cipher key and iv length */
-       EVP_CIPHER_CTX packet_ctx;              /* Cipher context */
-       
-       const EVP_MD *digest;                   /* Digest type for MAC */
-       int maclength;                          /* Length of MAC */
+       cipher_t cipher;                        /* Cipher for UDP packets */
+       digest_t digest;                        /* Digest for UDP packets */    
+       int maclength;                          /* Portion of digest to use */
 
        int compression;                        /* Compressionlevel, 0 = no compression */
 
@@ -94,6 +92,6 @@ extern void node_add(node_t *);
 extern void node_del(node_t *);
 extern node_t *lookup_node(char *);
 extern node_t *lookup_node_udp(const sockaddr_t *);
-extern void dump_nodes(void);
+extern int dump_nodes(struct evbuffer *);
 
 #endif                                                 /* __TINC_NODE_H__ */