X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fedge.h;h=a7a6302d325c736e849720be9fcd8f421bf720f6;hp=c2212cc7fd935840da6721ab52423163dae05740;hb=57bc9a1835bcb6a8df7963ee4ab04fde34f28eaf;hpb=94497336efc1cc60561575e74d420e9e8e8c657e

diff --git a/src/edge.h b/src/edge.h
index c2212cc7..a7a6302d 100644
--- a/src/edge.h
+++ b/src/edge.h
@@ -1,7 +1,10 @@
+#ifndef TINC_EDGE_H
+#define TINC_EDGE_H
+
 /*
     edge.h -- header for edge.c
-    Copyright (C) 2001 Guus Sliepen <guus@sliepen.warande.net>,
-                  2001 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2001-2006 Guus Sliepen <guus@tinc-vpn.org>,
+                  2001-2005 Ivo Timmermans
 
     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
@@ -13,50 +16,39 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    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.1 2001/10/28 08:41:19 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#ifndef __TINC_EDGE_H__
-#define __TINC_EDGE_H__
-
-#include <avl_tree.h>
-
-#include "node.h"
+#include "avl_tree.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;
+#include "net.h"
+#include "node.h"
 
 typedef struct edge_t {
-  struct node_t *from;
-  struct node_t *to;
+	struct node_t *from;
+	struct node_t *to;
+	sockaddr_t address;
+
+	uint32_t options;                /* options turned on for this edge */
+	int weight;                      /* weight of this edge */
 
-  long int options;                /* options turned on for this connection */
-  int metric;                      /* 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 vertices (replaces active_tree) */
+extern avl_tree_t *edge_weight_tree;     /* Tree with all known edges sorted on weight */
 
-extern void init_vertices(void);
-extern void exit_vertices(void);
-extern edge_t *new_edge(void);
-extern void free_edge(edge_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_vertices(void);
+extern void init_edges(void);
+extern void exit_edges(void);
+extern edge_t *new_edge(void) __attribute__((__malloc__));
+extern void free_edge(edge_t *e);
+extern avl_tree_t *new_edge_tree(void) __attribute__((__malloc__));
+extern void free_edge_tree(avl_tree_t *edge_tree);
+extern void edge_add(edge_t *e);
+extern void edge_del(edge_t *e);
+extern edge_t *lookup_edge(struct node_t *from, struct node_t *to);
+extern void dump_edges(void);
 
-#endif /* __TINC_EDGE_H__ */
+#endif