Removed everything from connection.c that has already been moved to node.c and

[tinc] / src / node.h

diff --git a/src/node.h b/src/node.h
index 815b793..e6b28d2 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -17,9 +17,14 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: node.h,v 1.1.2.1 2001/10/09 19:30:30 guus Exp $
+    $Id: node.h,v 1.1.2.3 2001/10/10 08:49:47 guus Exp $
 */
 
+#ifndef __TINC_NODE_H__
+#define __TINC_NODE_H__
+
+#include <avl_tree.h>
+
 typedef struct node_t {
   char *name;                      /* name of this connection */
   int protocol_version;            /* used protocol */
@@ -31,9 +36,9 @@ typedef struct node_t {
 
   status_bits_t status;            /* status info */
 
-  EVP_CIPHER *cipher_pkttype;      /* Cipher type for UDP packets */ 
-  char *cipher_pktkey;             /* Cipher key and iv */
-  int cipher_pktkeylength;         /* Cipher key and iv length*/
+  EVP_CIPHER *cipher;              /* Cipher type for UDP packets */ 
+  char *key;                       /* Cipher key and iv */
+  int keylength;                   /* Cipher key and iv length*/
 
   list_t *queue;                   /* Queue for packets awaiting to be encrypted */
 
@@ -45,3 +50,8 @@ typedef struct node_t {
 
   struct config_t *config;         /* Pointer to configuration tree belonging to this node */
 } node_t;
+
+struct node_t *myself;
+extern avl_tree_t *node_tree;
+
+#endif /* __TINC_NODE_H__ */