projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Even better svn-clean command.
[tinc]
/
src
/
node.c
diff --git
a/src/node.c
b/src/node.c
index
0401144
..
3519916
100644
(file)
--- a/
src/node.c
+++ b/
src/node.c
@@
-17,7
+17,7
@@
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.
24 2003/07/24 12:08:15
guus Exp $
+ $Id: node.c,v 1.1.2.
31 2003/12/22 11:04:16
guus Exp $
*/
#include "system.h"
*/
#include "system.h"
@@
-58,7
+58,7
@@
void init_nodes(void)
{
cp();
{
cp();
- node_tree = avl_alloc_tree((avl_compare_t) node_compare,
NULL
);
+ 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_udp_tree = avl_alloc_tree((avl_compare_t) node_udp_compare, NULL);
}
@@
-66,13
+66,13
@@
void exit_nodes(void)
{
cp();
{
cp();
- avl_delete_tree(node_tree);
avl_delete_tree(node_udp_tree);
avl_delete_tree(node_udp_tree);
+ avl_delete_tree(node_tree);
}
node_t *new_node(void)
{
}
node_t *new_node(void)
{
- node_t *n =
(node_t *)
xmalloc_and_zero(sizeof(*n));
+ node_t *n = xmalloc_and_zero(sizeof(*n));
cp();
cp();
@@
-80,6
+80,8
@@
node_t *new_node(void)
n->edge_tree = new_edge_tree();
n->queue = list_alloc((list_action_t) free);
EVP_CIPHER_CTX_init(&n->packet_ctx);
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;
}
@@
-106,7
+108,12
@@
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);
EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
+
+ if(n->mtuevent)
+ event_del(n->mtuevent);
free(n);
}
free(n);
}
@@
-129,13
+136,13
@@
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);
}
@@
-143,26
+150,26
@@
void node_del(node_t *n)
avl_delete(node_udp_tree, n);
}
avl_delete(node_udp_tree, n);
}
-node_t *lookup_node(c
onst c
har *name)
+node_t *lookup_node(char *name)
{
{
- node_t n = {
- .name = name,
- };
+ node_t n = {0};
cp();
cp();
+ n.name = name;
+
return avl_search(node_tree, &n);
}
node_t *lookup_node_udp(const sockaddr_t *sa)
{
return avl_search(node_tree, &n);
}
node_t *lookup_node_udp(const sockaddr_t *sa)
{
- node_t n = {
- .address = *sa,
- .name = NULL,
- };
+ node_t n = {0};
cp();
cp();
+ n.address = *sa;
+ n.name = NULL;
+
return avl_search(node_udp_tree, &n);
}
return avl_search(node_udp_tree, &n);
}
@@
-176,12
+183,12
@@
void dump_nodes(void)
logger(LOG_DEBUG, _("Nodes:"));
for(node = node_tree->head; node; node = node->next) {
logger(LOG_DEBUG, _("Nodes:"));
for(node = node_tree->head; node; node = node->next) {
- n =
(node_t *)
node->data;
- logger(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
);
}
logger(LOG_DEBUG, _("End of nodes."));
}
logger(LOG_DEBUG, _("End of nodes."));