Merge branch 'master' into 1.1

[meshlink] / src / node.h

diff --git a/src/node.h b/src/node.h
index 0476cdb062430de506dce3c01e124e2b73874d5d..f4fc88bbc5fc887a7f0740c37810ef12578226c1 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -1,6 +1,6 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2001-2009 Guus Sliepen <guus@tinc-vpn.org>,
                   2001-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -23,8 +23,12 @@
 #ifndef __TINC_NODE_H__
 #define __TINC_NODE_H__
 
+#include <event.h>
+
 #include "splay_tree.h"
+#include "cipher.h"
 #include "connection.h"
+#include "digest.h"
 #include "list.h"
 #include "subnet.h"
 
@@ -50,18 +54,13 @@ 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 */
 
-       list_t *queue;                          /* Queue for packets awaiting to be encrypted */
-
+       int distance;
        struct node_t *nexthop;                 /* nearest node from us to him */
        struct node_t *via;                     /* next hop for UDP packets */