Revert to edge and graph stuff. This time, use a directed graph.

[tinc] / src / edge.h

diff --git a/src/edge.h b/src/edge.h
index 3bd475e..e3735e6 100644 (file)
--- a/src/edge.h
+++ b/src/edge.h
@@ -1,7 +1,7 @@
 /*
     edge.h -- header for edge.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,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: edge.h,v 1.1.2.2 2001/10/28 10:16:18 guus Exp $
+    $Id: edge.h,v 1.1.2.9 2002/09/04 13:48:51 guus Exp $
 */
 
 #ifndef __TINC_EDGE_H__
@@ -25,36 +25,31 @@
 
 #include <avl_tree.h>
 
+#include "net.h"
 #include "node.h"
 #include "connection.h"
 
-/* I don't know if halfconnection_t is useful... */
-
-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 edge_t {
   struct node_t *from;
   struct node_t *to;
+  sockaddr_t address;
 
   long int options;                /* options turned on for this edge */
   int weight;                      /* weight of this edge */
   
   struct connection_t *connection; /* connection associated with this edge, if available */
+  struct edge_t *reverse;          /* edge in the opposite direction, if available */
 } edge_t;
 
-extern avl_tree_t *edge_tree;    /* Tree with all known edges (replaces active_tree) */
+extern avl_tree_t *edge_tree;        /* Tree with all known edges */
 extern avl_tree_t *edge_weight_tree; /* Tree with all known edges sorted on weight */
 
 extern void init_edges(void);
 extern void exit_edges(void);
 extern edge_t *new_edge(void);
 extern void free_edge(edge_t *);
+extern avl_tree_t *new_edge_tree(void);
+extern void free_edge_tree(avl_tree_t *);
 extern void edge_add(edge_t *);
 extern void edge_del(edge_t *);
 extern edge_t *lookup_edge(struct node_t *, struct node_t *);