X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnode.h;h=83305ce3c3740b760761090bd76c6440dcfcbd02;hp=815b793f543f92870b87d5b22c955d71268f4b36;hb=c2752b961c9262386b940c2c053b9909bee22859;hpb=49a2cd806c73cff1ab6a712a996c7f7d4e1f32c0

diff --git a/src/node.h b/src/node.h
index 815b793f..83305ce3 100644
--- a/src/node.h
+++ b/src/node.h
@@ -17,31 +17,63 @@
     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.9 2001/11/16 15:56:44 zarq Exp $
 */
 
+#ifndef __TINC_NODE_H__
+#define __TINC_NODE_H__
+
+#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 visited:1;                   /* 1 if this node has been visited by one of the graph algorithms */
+  int unused:28;
+} node_status_t;
+
 typedef struct node_t {
-  char *name;                      /* name of this connection */
-  int protocol_version;            /* used protocol */
-  long int options;                /* options turned on for this connection */
+  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 */
+  struct addrinfo *address;        /* his real (internet) ip to send UDP packets to */
+  char *port;                      /* string representation of the port number */
   char *hostname;                  /* the hostname of its real ip */
 
-  status_bits_t status;            /* status info */
+  struct node_status_t status;
 
-  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 */
 
-  struct node_t *nexthop;          /* nearest meta-hop from us to him */
-  struct node_t *prevhop;          /* nearest meta-hop from him to us */
+  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 */
 
-  struct config_t *config;         /* Pointer to configuration tree 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) */
 } node_t;
+
+extern struct node_t *myself;
+extern avl_tree_t *node_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 *lookup_node(char *);
+extern node_t *lookup_node_udp(struct addrinfo *);
+extern void dump_nodes(void);
+
+
+#endif /* __TINC_NODE_H__ */