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

diff --git a/src/node.h b/src/node.h
index b662ccd0..f2bea91b 100644
--- a/src/node.h
+++ b/src/node.h
@@ -1,7 +1,7 @@
 /*
     node.h -- header for node.c
-    Copyright (C) 2001-2002 Guus Sliepen <guus@sliepen.warande.net>,
-                  2001-2002 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.11 2002/02/11 15:59:18 guus Exp $
+    $Id: node.h,v 1.1.2.18 2002/09/04 08:33:08 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"
@@ -34,19 +38,21 @@ typedef struct node_status_t {
   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 unused:27;
+  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 */
-  port_t 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;
 
+  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*/
@@ -59,16 +65,15 @@ typedef struct node_t {
   list_t *queue;                   /* Queue for packets awaiting to be encrypted */
 
   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 *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) */
 
-  unsigned int sent_seqno;         /* Sequence number last sent to this node */
-  unsigned int received_seqno;     /* Sequence number last received from this node */
+  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;
@@ -78,11 +83,11 @@ 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__ */