X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.h;h=b5cd8a741b5ad8283a1ef63ddd346c0268263ee4;hp=f2bea91bb70f38c9b991bab55f412200b6bfefc4;hb=1401faf608e1c8af0d0754e545b0ec79d2bd5d93;hpb=698d6ddac6ab32d5a4b802941b02232793442684

diff --git a/src/node.h b/src/node.h
index f2bea91b..b5cd8a74 100644
--- a/src/node.h
+++ b/src/node.h
@@ -17,14 +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.18 2002/09/04 08:33:08 guus Exp $
+    $Id: node.h,v 1.1.2.23 2003/07/06 23:16:28 guus Exp $
 */
 
 #ifndef __TINC_NODE_H__
 #define __TINC_NODE_H__
 
 #ifdef HAVE_INTTYPES_H
- #include <inttypes.h>
+#include <inttypes.h>
 #endif
 
 #include <avl_tree.h>
@@ -33,47 +33,48 @@
 #include "connection.h"
 
 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 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;
+	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 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 */
+	char *name;					/* name of this node */
+	long int options;			/* options turned on for this node */
 
-  sockaddr_t address;              /* his real (internet) ip to send UDP packets to */
-  char *hostname;                  /* the hostname of its real ip */
+	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;
+	struct node_status_t status;
 
-  int distance;                    /* Distance from us to that node */
-  
-  const EVP_CIPHER *cipher;        /* Cipher type for UDP packets */ 
-  char *key;                       /* Cipher key and iv */
-  int keylength;                   /* Cipher key and iv length*/
+	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 */
 
-  const EVP_MD *digest;            /* Digest type for MAC */
-  int maclength;                   /* Length of MAC */
+	int compression;			/* Compressionlevel, 0 = no compression */
 
-  int compression;                 /* Compressionlevel, 0 = no compression */
+	list_t *queue;				/* Queue for packets awaiting to be encrypted */
 
-  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 */
 
-  struct node_t *nexthop;          /* nearest node from us to him */
-  struct node_t *prevhop;          /* nearest node from him to us */
-  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 *subnet_tree;	/* Pointer to a tree of subnets belonging to this node */
 
-  struct connection_t *connection; /* Connection associated with this node (if a direct connection exists) */
+	avl_tree_t *edge_tree;		/* Edges with this node as one of the endpoints */
 
-  uint32_t sent_seqno;         /* Sequence number last sent to this node */
-  uint32_t received_seqno;     /* Sequence number last received from this node */
+	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 */
+	unsigned char late[16];	/* Bitfield marking late packets */
 } node_t;
 
 extern struct node_t *myself;
@@ -82,7 +83,7 @@ extern avl_tree_t *node_udp_tree;
 
 extern void init_nodes(void);
 extern void exit_nodes(void);
-extern node_t *new_node(void);
+extern node_t *new_node(void) __attribute__ ((malloc));
 extern void free_node(node_t *);
 extern void node_add(node_t *);
 extern void node_del(node_t *);
@@ -90,4 +91,4 @@ extern node_t *lookup_node(char *);
 extern node_t *lookup_node_udp(sockaddr_t *);
 extern void dump_nodes(void);
 
-#endif /* __TINC_NODE_H__ */
+#endif							/* __TINC_NODE_H__ */