X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fvertex.h;h=9b1ef2b99cfd495a337df7ff81e1d6c7a2d833e7;hb=26e517dd37e995fe9db518f7ebeff023fc73ff1b;hp=b5504d5688690013f6822bedcfe0eb2845aa3af6;hpb=49a2cd806c73cff1ab6a712a996c7f7d4e1f32c0;p=tinc

diff --git a/src/vertex.h b/src/vertex.h
index b5504d56..9b1ef2b9 100644
--- a/src/vertex.h
+++ b/src/vertex.h
@@ -17,25 +17,35 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: vertex.h,v 1.1.2.1 2001/10/09 19:30:30 guus Exp $
+    $Id: vertex.h,v 1.1.2.4 2001/10/10 20:35:10 guus Exp $
 */
 
+#ifndef __TINC_VERTEX_H__
+#define __TINC_VERTEX_H__
+
+#include <avl_tree.h>
+
+#include "node.h"
+#include "connection.h"
+
+typedef struct halfconnection_t {
+  struct node_t *node;             /* node associated with this end of the connection */
+
+  ipv4_t address;                  /* real (internet) ip on this end of the meta connection */
+  short unsigned int port;         /* port number of this end of the meta connection */
+  char *hostname;                  /* the hostname of real ip */
+} halfconnection_t;
+
 typedef struct vertex_t {
-  struct halfconnection_t *from;
-  struct halfconnection_t *to;
+  struct halfconnection_t from;
+  struct halfconnection_t to;
+
   long int options;                /* options turned on for this connection */
+  int metric;                      /* weight of this vertex */
+  
+  struct connection_t *connection; /* connection associated with this vertex, if available */
 } vertex_t;
 
-typedef struct halfconnection_t {
-  struct node_t *node;
+extern avl_tree_t *vertex_tree;    /* Tree with all known vertices (replaces active_tree) */
 
-  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 */
-  
-  RSA *rsa_key;
-  EVP_CIPHER_CTX *ctx;
-  char *metakey;
-  char *pktkey;
-  char *challenge;
-} halfconnection_t;
+#endif /* __TINC_VERTEX_H__ */