X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fedge.h;h=0e951fa644a742ca8d5afbefaa958d07c00bb14c;hp=2e5b910d6520a076de48dd4256f8db14a9a9f95f;hb=714fb32d0377ed9f5643ed8f0bd914843d12266b;hpb=627f7c22b447bd464b536cd016278545674df93d

diff --git a/src/edge.h b/src/edge.h
index 2e5b910d..0e951fa6 100644
--- a/src/edge.h
+++ b/src/edge.h
@@ -1,7 +1,7 @@
 /*
     edge.h -- header for edge.c
-    Copyright (C) 2001-2002 Guus Sliepen <guus@sliepen.eu.org>,
-                  2001-2002 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2001-2003 Guus Sliepen <guus@sliepen.eu.org>,
+                  2001-2003 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,46 +17,40 @@
     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.8 2002/06/21 10:11:12 guus Exp $
+    $Id: edge.h,v 1.1.2.16 2003/07/29 10:50:15 guus Exp $
 */
 
 #ifndef __TINC_EDGE_H__
 #define __TINC_EDGE_H__
 
-#include <avl_tree.h>
-
+#include "avl_tree.h"
+#include "connection.h"
 #include "net.h"
 #include "node.h"
-#include "connection.h"
-
-typedef struct halfconnection_t {
-  struct node_t *node;             /* node associated with this end of the connection */
-//  sockaddr_t tcpaddress;           /* real (internet) ip on this end of the meta connection */
-  sockaddr_t udpaddress;           /* real (internet) ip on this end of the vpn connection */
-} halfconnection_t;
 
 typedef struct edge_t {
-  struct halfconnection_t from;
-  struct halfconnection_t to;
+	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 */
 
-  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 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_weight_tree; /* Tree with all known edges sorted on weight */
+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 edge_t *new_edge(void) __attribute__ ((malloc));
 extern void free_edge(edge_t *);
-extern avl_tree_t *new_edge_tree(void);
+extern avl_tree_t *new_edge_tree(void) __attribute__ ((malloc));
 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 *);
 extern void dump_edges(void);
 
-#endif /* __TINC_EDGE_H__ */
+#endif							/* __TINC_EDGE_H__ */