projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get_config_{ip,port} removed.
[tinc]
/
src
/
edge.h
diff --git
a/src/edge.h
b/src/edge.h
index
c2212cc
..
0de989a
100644
(file)
--- a/
src/edge.h
+++ b/
src/edge.h
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
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 $
+ $Id: edge.h,v 1.1.2.
4 2001/11/16 12:13:34 zarq
Exp $
*/
#ifndef __TINC_EDGE_H__
*/
#ifndef __TINC_EDGE_H__
@@
-33,8
+33,7
@@
typedef struct halfconnection_t {
struct node_t *node; /* node associated with this end of the connection */
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 */
+ struct addrinfo *address; /* real (internet) ip on this end of the meta connection */
char *hostname; /* the hostname of real ip */
} halfconnection_t;
char *hostname; /* the hostname of real ip */
} halfconnection_t;
@@
-42,21
+41,24
@@
typedef struct edge_t {
struct node_t *from;
struct node_t *to;
struct node_t *from;
struct node_t *to;
- long int options; /* options turned on for this
connection
*/
- int
metric
; /* 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 */
} edge_t;
struct connection_t *connection; /* connection associated with this edge, if available */
} edge_t;
-extern avl_tree_t *edge_tree; /* Tree with all known vertices (replaces active_tree) */
+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 void init_
vertic
es(void);
-extern void exit_
vertic
es(void);
+extern void init_
edg
es(void);
+extern void exit_
edg
es(void);
extern edge_t *new_edge(void);
extern void free_edge(edge_t *);
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 *);
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_
vertic
es(void);
+extern void dump_
edg
es(void);
#endif /* __TINC_EDGE_H__ */
#endif /* __TINC_EDGE_H__ */