projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep Windows happy.
[tinc]
/
src
/
node.c
diff --git
a/src/node.c
b/src/node.c
index
48a4ebd
..
b69c5b1
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
3
Guus Sliepen <guus@sliepen.eu.org>,
+ 2001-200
3
Ivo Timmermans <ivo@o2w.nl>
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,34
+17,30
@@
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.
19 2003/05/06 21:13:17
guus Exp $
+ $Id: node.c,v 1.1.2.
26 2003/07/30 11:50:45
guus Exp $
*/
*/
-#include "config.h"
-
-#include <string.h>
-#include <syslog.h>
+#include "system.h"
-#include <avl_tree.h>
-#include "node.h"
-#include "netutl.h"
+#include "avl_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 */
node_t *myself;
avl_tree_t *node_tree; /* Known nodes, sorted by name */
avl_tree_t *node_udp_tree; /* Known nodes, sorted by address and port */
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;
{
int result;
@@
-149,16
+145,21
@@
void node_del(node_t *n)
node_t *lookup_node(char *name)
{
node_t *lookup_node(char *name)
{
- node_t n;
+ node_t n = {0};
+
cp();
cp();
+
n.name = name;
n.name = name;
+
return avl_search(node_tree, &n);
}
return avl_search(node_tree, &n);
}
-node_t *lookup_node_udp(sockaddr_t *sa)
+node_t *lookup_node_udp(
const
sockaddr_t *sa)
{
{
- node_t n;
+ node_t n = {0};
+
cp();
cp();
+
n.address = *sa;
n.name = NULL;
n.address = *sa;
n.name = NULL;
@@
-172,16
+173,16
@@
void dump_nodes(void)
cp();
cp();
-
syslog
(LOG_DEBUG, _("Nodes:"));
+
logger
(LOG_DEBUG, _("Nodes:"));
for(node = node_tree->head; node; node = node->next) {
n = (node_t *) node->data;
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"),
+
logger
(LOG_DEBUG, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s"),
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->options,
*(uint32_t *)&
n->status, n->nexthop ? n->nexthop->name : "-",
n->via ? n->via->name : "-");
}
n->via ? n->via->name : "-");
}
-
syslog
(LOG_DEBUG, _("End of nodes."));
+
logger
(LOG_DEBUG, _("End of nodes."));
}
}