s/sliepen.warande.net/sliepen.eu.org/g

[tinc] / src / node.h

diff --git a/src/node.h b/src/node.h
index 9f2a35a..f80075f 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -1,7 +1,7 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001 Guus Sliepen <guus@sliepen.warande.net>,
-                  2001 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2001-2002 Guus Sliepen <guus@sliepen.eu.org>,
+                  2001-2002 Ivo Timmermans <ivo@o2w.nl>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,12 +17,16 @@
     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.5 2001/10/27 12:13:17 guus Exp $
+    $Id: node.h,v 1.1.2.16 2002/06/21 10:11:13 guus Exp $
 */
 
 #ifndef __TINC_NODE_H__
 #define __TINC_NODE_H__
 
+#ifdef HAVE_INTTYPES_H
+ #include <inttypes.h>
+#endif
+
 #include <avl_tree.h>
 
 #include "subnet.h"
@@ -32,45 +36,57 @@ typedef struct node_status_t {
   int active:1;                    /* 1 if active.. */
   int validkey:1;                  /* 1 if we currently have a valid key for him */
   int waitingforkey:1;             /* 1 if we already sent out a request */
-  int unused:29;
+  int visited:1;                   /* 1 if this node has been visited by one of the graph algorithms */
+  int reachable:1;                 /* 1 if this node is reachable in the graph */
+  int indirect:1;                  /* 1 if this node is not directly reachable by us */
+  int unused:26;
 } node_status_t;
 
 typedef struct node_t {
   char *name;                      /* name of this node */
   long int options;                /* options turned on for this node */
 
-  ipv4_t address;                  /* his real (internet) ip to send UDP packets to */
-  short unsigned int port;         /* port number of UDP connection */
+  sockaddr_t address;              /* his real (internet) ip to send UDP packets to */
   char *hostname;                  /* the hostname of its real ip */
 
   struct node_status_t status;
 
-  EVP_CIPHER *cipher;              /* Cipher type for UDP packets */ 
+  const 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 */
+  const EVP_MD *digest;            /* Digest type for MAC */
+  int maclength;                   /* Length of MAC */
+
+  int compression;                 /* Compressionlevel, 0 = no compression */
+
+  list_t *queue;                   /* Queue for packets awaiting to be encrypted */
 
   struct node_t *nexthop;          /* nearest node from us to him */
   struct node_t *via;              /* next hop for UDP packets */
   
   avl_tree_t *subnet_tree;         /* Pointer to a tree of subnets belonging to this node */
 
+  avl_tree_t *edge_tree;           /* Edges with this node as one of the endpoints */
+
   struct connection_t *connection; /* Connection associated with this node (if a direct connection exists) */
+
+  uint32_t sent_seqno;         /* Sequence number last sent to this node */
+  uint32_t received_seqno;     /* Sequence number last received from this node */
 } node_t;
 
 extern struct node_t *myself;
 extern avl_tree_t *node_tree;
+extern avl_tree_t *node_udp_tree;
 
 extern void init_nodes(void);
 extern void exit_nodes(void);
 extern node_t *new_node(void);
-extern void free_node(node_t *n);
-extern void node_add(node_t *n);
-extern void node_del(node_t *n);
+extern void free_node(node_t *);
+extern void node_add(node_t *);
+extern void node_del(node_t *);
 extern node_t *lookup_node(char *);
-extern node_t *lookup_node_udp(ipv4_t, port_t);
+extern node_t *lookup_node_udp(sockaddr_t *);
 extern void dump_nodes(void);
 
-
 #endif /* __TINC_NODE_H__ */