projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use splay trees instead of AVL trees.
[tinc]
/
src
/
edge.h
diff --git
a/src/edge.h
b/src/edge.h
index
9a60af6
..
082ea5d
100644
(file)
--- a/
src/edge.h
+++ b/
src/edge.h
@@
-1,7
+1,7
@@
/*
edge.h -- header for edge.c
/*
edge.h -- header for edge.c
- Copyright (C) 2001-200
2 Guus Sliepen <guus@sliepen.warande.net
>,
- 2001-200
2 Ivo Timmermans <itimmermans@bigfoot.com>
+ Copyright (C) 2001-200
6 Guus Sliepen <guus@tinc-vpn.org
>,
+ 2001-200
5 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
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.
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$
*/
#ifndef __TINC_EDGE_H__
#define __TINC_EDGE_H__
*/
#ifndef __TINC_EDGE_H__
#define __TINC_EDGE_H__
-#include <avl_tree.h>
-
-#include "node.h"
+#include "splay_tree.h"
#include "connection.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 {
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;
} 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 splay_tree_t *edge_weight_tree; /* Tree with all known edges sorted on weight */
extern void init_edges(void);
extern void exit_edges(void);
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 void free_edge(edge_t *);
-extern
avl_tree_t *new_edge_tree(void
);
-extern void free_edge_tree(
avl
_tree_t *);
+extern
splay_tree_t *new_edge_tree(void) __attribute__ ((__malloc__)
);
+extern void free_edge_tree(
splay
_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);
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__ */