X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fedge.h;h=e3735e63b76d38ddc48aff6248d7cdb464358c88;hp=9a60af652a645d6ddb304e4c616632b94bc1fa8a;hb=82ebfc923ddb050c88bdf5d65ac943a15ca8748a;hpb=f0aa9641e82fb6e09c1e485366d14dddaa7f7c36 diff --git a/src/edge.h b/src/edge.h index 9a60af65..e3735e63 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 , - 2001-2002 Ivo Timmermans + Copyright (C) 2001-2002 Guus Sliepen , + 2001-2002 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 @@ -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.5 2002/02/10 21:57:54 guus Exp $ + $Id: edge.h,v 1.1.2.9 2002/09/04 13:48:51 guus Exp $ */ #ifndef __TINC_EDGE_H__ @@ -25,27 +25,23 @@ #include +#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 */ - - 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; - 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 */ 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);