X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fedge.h;h=ef4feefcac2a1c81d1c720406797bc7b585391f7;hp=9a60af652a645d6ddb304e4c616632b94bc1fa8a;hb=3fae14fae5a347823679ef694ab630b4991a201d;hpb=f0aa9641e82fb6e09c1e485366d14dddaa7f7c36

diff --git a/src/edge.h b/src/edge.h
index 9a60af65..ef4feefc 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-2002 Guus Sliepen <guus@sliepen.warande.net>,
-                  2001-2002 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.5 2002/02/10 21:57:54 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"
-
-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 */
-  port_t port;                     /* port number of this end of the meta connection */
-} halfconnection_t;
+#include "net.h"
+#include "node.h"
 
 typedef struct edge_t {
-  struct halfconnection_t from;
-  struct halfconnection_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 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