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
89b1689
..
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
2 Guus Sliepen <guus@sliepen.eu
.org>,
- 2001-200
2 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,35
+17,29
@@
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.17 2002/09/09 21:24:41 guus Exp
$
+ $Id$
*/
*/
-#include "config.h"
-
-#include <string.h>
-#include <syslog.h>
+#include "system.h"
-#include <avl_tree.h>
-#include "node.h"
-#include "netutl.h"
+#include "splay_tree.h"
+#include "logger.h"
#include "net.h"
#include "net.h"
-#include
<utils.h>
-#include
<xalloc.h>
-
-#include "
system
.h"
+#include
"netutl.h"
+#include
"node.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;
-int node_compare(node_t * a, 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);
}
-int node_udp_compare(node_t * a, node_t * b)
-{
+static int node_udp_compare(const node_t *a, const node_t *b) {
int result;
cp();
int result;
cp();
@@
-58,48
+52,41
@@
int node_udp_compare(node_t * a, 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, NULL
);
- 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
_tree);
-
avl_delete_tree(node_udp
_tree);
+
splay_delete_tree(node_udp
_tree);
+
splay_delete_tree(node
_tree);
}
}
-node_t *new_node(void)
-{
- node_t *n = (node_t *) xmalloc_and_zero(sizeof(*n));
+node_t *new_node(void) {
+ node_t *n = xmalloc_and_zero(sizeof(*n));
cp();
n->subnet_tree = new_subnet_tree();
n->edge_tree = new_edge_tree();
n->queue = list_alloc((list_action_t) free);
cp();
n->subnet_tree = new_subnet_tree();
n->edge_tree = new_edge_tree();
n->queue = list_alloc((list_action_t) free);
+ EVP_CIPHER_CTX_init(&n->packet_ctx);
+ n->mtu = MTU;
+ n->maxmtu = MTU;
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);
@@
-109,20
+96,29
@@
void free_node(node_t * n)
if(n->edge_tree)
free_edge_tree(n->edge_tree);
if(n->edge_tree)
free_edge_tree(n->edge_tree);
+ sockaddrfree(&n->address);
+
+ EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
+
+ 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;
@@
-130,55
+126,56
@@
void node_del(node_t * n)
for(node = n->subnet_tree->head; node; node = next) {
next = node->next;
for(node = n->subnet_tree->head; node; node = next) {
next = node->next;
- s =
(subnet_t *)
node->data;
+ s = node->data;
subnet_del(n, s);
}
for(node = n->edge_tree->head; node; node = next) {
next = node->next;
subnet_del(n, s);
}
for(node = n->edge_tree->head; node; node = next) {
next = node->next;
- e =
(edge_t *)
node->data;
+ e = node->data;
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 n;
+node_t *lookup_node(char *name)
{
+ node_t n = {0};
+
cp();
cp();
+
n.name = name;
n.name = name;
- return avl_search(node_tree, &n);
+
+ return splay_search(node_tree, &n);
}
}
-node_t *lookup_node_udp(
sockaddr_t * sa)
-{
- node_t n;
+node_t *lookup_node_udp(
const sockaddr_t *sa) {
+ node_t n = {0};
+
cp();
cp();
+
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();
-
syslog
(LOG_DEBUG, _("Nodes:"));
+
logger
(LOG_DEBUG, _("Nodes:"));
for(node = node_tree->head; node; node = node->next) {
for(node = node_tree->head; node; node = node->next) {
- n =
(node_t *)
node->data;
-
syslog(LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s
"),
+ n = node->data;
+
logger(LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s pmtu %d (min %d max %d)
"),
n->name, n->hostname, n->cipher ? n->cipher->nid : 0,
n->digest ? n->digest->type : 0, n->maclength, n->compression,
n->name, n->hostname, n->cipher ? n->cipher->nid : 0,
n->digest ? n->digest->type : 0, n->maclength, n->compression,
- n->options, n->status, n->nexthop ? n->nexthop->name : "-",
- n->via ? n->via->name : "-");
+ n->options,
*(uint32_t *)&
n->status, n->nexthop ? n->nexthop->name : "-",
+ n->via ? n->via->name : "-"
, n->mtu, n->minmtu, n->maxmtu
);
}
}
-
syslog
(LOG_DEBUG, _("End of nodes."));
+
logger
(LOG_DEBUG, _("End of nodes."));
}
}