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

diff --git a/src/node.h b/src/node.h
index b7c77e63..b5cd8a74 100644
--- 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,61 +17,78 @@
     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.6 2001/10/28 10:16:18 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>
+#endif
+
 #include <avl_tree.h>
 
 #include "subnet.h"
 #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 mst:1;                       /* 1 if this node has been visited by the MST algorithm */
-  int unused:28;
+	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 */
+
+	struct node_status_t status;
 
-  ipv4_t address;                  /* his real (internet) ip to send UDP packets to */
-  short unsigned int port;         /* port number of UDP connection */
-  char *hostname;                  /* the hostname of its real ip */
+	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 */
 
-  struct node_status_t status;
+	int compression;			/* Compressionlevel, 0 = no compression */
 
-  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 */
 
-  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 *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 */
+
+	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;
 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 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 *);
 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__ */
+#endif							/* __TINC_NODE_H__ */