projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
We can safely delete a connection_t in terminate_connection() now.
[tinc]
/
src
/
edge.c
diff --git
a/src/edge.c
b/src/edge.c
index
0a47f8c
..
861b945
100644
(file)
--- a/
src/edge.c
+++ b/
src/edge.c
@@
-1,7
+1,7
@@
/*
edge.c -- edge tree management
/*
edge.c -- edge tree management
- Copyright (C) 2000-200
2 Guus Sliepen <guus@sliepen.eu
.org>,
- 2000-200
2 Ivo Timmermans <ivo@o2w.nl>
+ Copyright (C) 2000-200
6 Guus Sliepen <guus@tinc-vpn
.org>,
+ 2000-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,38
+17,26
@@
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.c,v 1.1.2.18 2002/09/10 22:12:33 guus Exp
$
+ $Id$
*/
*/
-#include "config.h"
-
-#include <stdio.h>
-#include <syslog.h>
-#include <string.h>
-
-#include <avl_tree.h>
-#include <list.h>
+#include "system.h"
-#include "net.h" /* Don't ask. */
-#include "netutl.h"
-#include "conf.h"
-#include <utils.h>
-#include "subnet.h"
+#include "splay_tree.h"
#include "edge.h"
#include "edge.h"
+#include "logger.h"
+#include "netutl.h"
#include "node.h"
#include "node.h"
-
+#include "utils.h"
#include "xalloc.h"
#include "xalloc.h"
-#include "system.h"
-
avl_tree_t *edge_weight_tree;
/* Tree with all edges, sorted on weight */
+
splay_tree_t *edge_weight_tree;
/* Tree with all edges, sorted on weight */
-int edge_compare(edge_t *a, edge_t *b)
-{
+static int edge_compare(const edge_t *a, const edge_t *b) {
return strcmp(a->to->name, b->to->name);
}
return strcmp(a->to->name, b->to->name);
}
-int edge_weight_compare(edge_t *a, edge_t *b)
-{
+static int edge_weight_compare(const edge_t *a, const edge_t *b) {
int result;
result = a->weight - b->weight;
int result;
result = a->weight - b->weight;
@@
-64,57
+52,51
@@
int edge_weight_compare(edge_t *a, edge_t *b)
return strcmp(a->to->name, b->to->name);
}
return strcmp(a->to->name, b->to->name);
}
-void init_edges(void)
-{
+void init_edges(void) {
cp();
cp();
- edge_weight_tree =
- avl_alloc_tree((avl_compare_t) edge_weight_compare, NULL);
+ edge_weight_tree = splay_alloc_tree((splay_compare_t) edge_weight_compare, NULL);
}
}
-avl_tree_t *new_edge_tree(void)
-{
+splay_tree_t *new_edge_tree(void) {
cp();
cp();
- return
avl_alloc_tree((avl_compare_t) edge_compare, NULL
);
+ return
splay_alloc_tree((splay_compare_t) edge_compare, (splay_action_t) free_edge
);
}
}
-void free_edge_tree(avl_tree_t *edge_tree)
-{
+void free_edge_tree(splay_tree_t *edge_tree) {
cp();
cp();
-
avl
_delete_tree(edge_tree);
+
splay
_delete_tree(edge_tree);
}
}
-void exit_edges(void)
-{
+void exit_edges(void) {
cp();
cp();
-
avl
_delete_tree(edge_weight_tree);
+
splay
_delete_tree(edge_weight_tree);
}
/* Creation and deletion of connection elements */
}
/* Creation and deletion of connection elements */
-edge_t *new_edge(void)
-{
+edge_t *new_edge(void) {
cp();
cp();
- return
(edge_t *)
xmalloc_and_zero(sizeof(edge_t));
+ return xmalloc_and_zero(sizeof(edge_t));
}
}
-void free_edge(edge_t *e)
-{
+void free_edge(edge_t *e) {
cp();
cp();
+
+ sockaddrfree(&e->address);
free(e);
}
free(e);
}
-void edge_add(edge_t *e)
-{
+void edge_add(edge_t *e) {
cp();
cp();
-
avl
_insert(edge_weight_tree, e);
-
avl
_insert(e->from->edge_tree, e);
+
splay
_insert(edge_weight_tree, e);
+
splay
_insert(e->from->edge_tree, e);
e->reverse = lookup_edge(e->to, e->from);
e->reverse = lookup_edge(e->to, e->from);
@@
-122,50
+104,47
@@
void edge_add(edge_t *e)
e->reverse->reverse = e;
}
e->reverse->reverse = e;
}
-void edge_del(edge_t *e)
-{
+void edge_del(edge_t *e) {
cp();
if(e->reverse)
e->reverse->reverse = NULL;
cp();
if(e->reverse)
e->reverse->reverse = NULL;
-
avl_delete(e->from->edge
_tree, e);
-
avl_delete(edge_weight
_tree, e);
+
splay_delete(edge_weight
_tree, e);
+
splay_delete(e->from->edge
_tree, e);
}
}
-edge_t *lookup_edge(node_t *from, node_t *to)
-{
+edge_t *lookup_edge(node_t *from, node_t *to) {
edge_t v;
edge_t v;
-
+
cp();
v.from = from;
v.to = to;
cp();
v.from = from;
v.to = to;
- return
avl
_search(from->edge_tree, &v);
+ return
splay
_search(from->edge_tree, &v);
}
}
-void dump_edges(void)
-{
- avl_node_t *node, *node2;
+void dump_edges(void) {
+ splay_node_t *node, *node2;
node_t *n;
edge_t *e;
char *address;
cp();
node_t *n;
edge_t *e;
char *address;
cp();
-
syslog
(LOG_DEBUG, _("Edges:"));
+
logger
(LOG_DEBUG, _("Edges:"));
for(node = node_tree->head; node; node = node->next) {
for(node = node_tree->head; node; node = node->next) {
- n =
(node_t *)
node->data;
+ n = node->data;
for(node2 = n->edge_tree->head; node2; node2 = node2->next) {
for(node2 = n->edge_tree->head; node2; node2 = node2->next) {
- e =
(edge_t *)
node2->data;
+ e = node2->data;
address = sockaddr2hostname(&e->address);
address = sockaddr2hostname(&e->address);
-
syslog
(LOG_DEBUG, _(" %s to %s at %s options %lx weight %d"),
+
logger
(LOG_DEBUG, _(" %s to %s at %s options %lx weight %d"),
e->from->name, e->to->name, address, e->options, e->weight);
free(address);
}
}
e->from->name, e->to->name, address, e->options, e->weight);
free(address);
}
}
-
syslog
(LOG_DEBUG, _("End of edges."));
+
logger
(LOG_DEBUG, _("End of edges."));
}
}