projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix retrying outgoing connections.
[tinc]
/
src
/
node.c
diff --git
a/src/node.c
b/src/node.c
index
3519916
..
cbafe71
100644
(file)
--- a/
src/node.c
+++ b/
src/node.c
@@
-1,7
+1,7
@@
/*
node.c -- node tree management
/*
node.c -- node tree management
- Copyright (C) 2001-200
3 Guus Sliepen <guus@sliepen.eu
.org>,
- 2001-200
3 Ivo Timmermans <ivo@o2w.nl>
+ 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,12
+17,12
@@
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
: node.c,v 1.1.2.31 2003/12/22 11:04:16 guus Exp
$
+ $Id$
*/
#include "system.h"
*/
#include "system.h"
-#include "
avl
_tree.h"
+#include "
splay
_tree.h"
#include "logger.h"
#include "net.h"
#include "netutl.h"
#include "logger.h"
#include "net.h"
#include "netutl.h"
@@
-30,18
+30,16
@@
#include "utils.h"
#include "xalloc.h"
#include "utils.h"
#include "xalloc.h"
-
avl_tree_t *node_tree;
/* Known nodes, sorted by name */
-
avl_tree_t *node_udp_tree;
/* Known nodes, sorted by address and port */
+
splay_tree_t *node_tree;
/* Known nodes, sorted by name */
+
splay_tree_t *node_udp_tree;
/* Known nodes, sorted by address and port */
node_t *myself;
node_t *myself;
-static int node_compare(const node_t *a, const node_t *b)
-{
+static int node_compare(const node_t *a, const node_t *b) {
return strcmp(a->name, b->name);
}
return strcmp(a->name, b->name);
}
-static int node_udp_compare(const node_t *a, const node_t *b)
-{
+static int node_udp_compare(const node_t *a, const node_t *b) {
int result;
cp();
int result;
cp();
@@
-54,24
+52,21
@@
static int node_udp_compare(const node_t *a, const node_t *b)
return (a->name && b->name) ? strcmp(a->name, b->name) : 0;
}
return (a->name && b->name) ? strcmp(a->name, b->name) : 0;
}
-void init_nodes(void)
-{
+void init_nodes(void) {
cp();
cp();
- node_tree =
avl_alloc_tree((avl_compare_t) node_compare, (avl
_action_t) free_node);
- node_udp_tree =
avl_alloc_tree((avl
_compare_t) node_udp_compare, NULL);
+ node_tree =
splay_alloc_tree((splay_compare_t) node_compare, (splay
_action_t) free_node);
+ node_udp_tree =
splay_alloc_tree((splay
_compare_t) node_udp_compare, NULL);
}
}
-void exit_nodes(void)
-{
+void exit_nodes(void) {
cp();
cp();
-
avl
_delete_tree(node_udp_tree);
-
avl
_delete_tree(node_tree);
+
splay
_delete_tree(node_udp_tree);
+
splay
_delete_tree(node_tree);
}
}
-node_t *new_node(void)
-{
+node_t *new_node(void) {
node_t *n = xmalloc_and_zero(sizeof(*n));
cp();
node_t *n = xmalloc_and_zero(sizeof(*n));
cp();
@@
-86,19
+81,12
@@
node_t *new_node(void)
return n;
}
return n;
}
-void free_node(node_t *n)
-{
+void free_node(node_t *n) {
cp();
if(n->queue)
list_delete_list(n->queue);
cp();
if(n->queue)
list_delete_list(n->queue);
- if(n->name)
- free(n->name);
-
- if(n->hostname)
- free(n->hostname);
-
if(n->key)
free(n->key);
if(n->key)
free(n->key);
@@
-112,23
+100,25
@@
void free_node(node_t *n)
EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
- if(n->mtuevent)
- event_del(n->mtuevent);
+ event_del(&n->mtuevent);
+ if(n->hostname)
+ free(n->hostname);
+
+ if(n->name)
+ free(n->name);
+
free(n);
}
free(n);
}
-void node_add(node_t *n)
-{
+void node_add(node_t *n) {
cp();
cp();
- avl_insert(node_tree, n);
- avl_insert(node_udp_tree, n);
+ splay_insert(node_tree, n);
}
}
-void node_del(node_t *n)
-{
- avl_node_t *node, *next;
+void node_del(node_t *n) {
+ splay_node_t *node, *next;
edge_t *e;
subnet_t *s;
edge_t *e;
subnet_t *s;
@@
-146,23
+136,20
@@
void node_del(node_t *n)
edge_del(e);
}
edge_del(e);
}
- avl_delete(node_tree, n);
- avl_delete(node_udp_tree, n);
+ splay_delete(node_tree, n);
}
}
-node_t *lookup_node(char *name)
-{
+node_t *lookup_node(char *name) {
node_t n = {0};
cp();
n.name = name;
node_t n = {0};
cp();
n.name = name;
- return
avl
_search(node_tree, &n);
+ return
splay
_search(node_tree, &n);
}
}
-node_t *lookup_node_udp(const sockaddr_t *sa)
-{
+node_t *lookup_node_udp(const sockaddr_t *sa) {
node_t n = {0};
cp();
node_t n = {0};
cp();
@@
-170,12
+157,11
@@
node_t *lookup_node_udp(const sockaddr_t *sa)
n.address = *sa;
n.name = NULL;
n.address = *sa;
n.name = NULL;
- return
avl
_search(node_udp_tree, &n);
+ return
splay
_search(node_udp_tree, &n);
}
}
-void dump_nodes(void)
-{
- avl_node_t *node;
+void dump_nodes(void) {
+ splay_node_t *node;
node_t *n;
cp();
node_t *n;
cp();