X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=0960ca761c32595b940103091459c0a8ec852090;hb=d82fcc88f355e3c8144478a860dfae0b299004a9;hp=280a70cbb28252c77e8887f4e4e6085a5dcf540f;hpb=1b8f8918360b40a2749d40355266ed7dedbe41b5;p=tinc

diff --git a/src/node.c b/src/node.c
index 280a70cb..0960ca76 100644
--- a/src/node.c
+++ b/src/node.c
@@ -74,6 +74,7 @@ node_t *new_node(void) {
 	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;
 
@@ -86,6 +87,9 @@ void free_node(node_t *n) {
 	if(n->queue)
 		list_delete_list(n->queue);
 
+	if(n->key)
+		free(n->key);
+
 	if(n->subnet_tree)
 		free_subnet_tree(n->subnet_tree);
 
@@ -94,8 +98,7 @@ void free_node(node_t *n) {
 
 	sockaddrfree(&n->address);
 
-	cipher_close(&n->cipher);
-	digest_close(&n->digest);
+	EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
 
 	event_del(&n->mtuevent);
 	
@@ -157,22 +160,21 @@ node_t *lookup_node_udp(const sockaddr_t *sa) {
 	return splay_search(node_udp_tree, &n);
 }
 
-void dump_nodes(void) {
+int dump_nodes(struct evbuffer *out) {
 	splay_node_t *node;
 	node_t *n;
 
 	cp();
 
-	logger(LOG_DEBUG, _("Nodes:"));
-
 	for(node = node_tree->head; node; node = node->next) {
 		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, cipher_get_nid(&n->cipher),
-			   digest_get_nid(&n->digest), n->maclength, n->compression,
+		if(evbuffer_add_printf(out, _(" %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"),
+			   n->name, n->hostname, n->cipher ? n->cipher->nid : 0,
+			   n->digest ? n->digest->type : 0, n->maclength, n->compression,
 			   n->options, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-",
-			   n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu);
+			   n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu) == -1)
+			return errno;
 	}
 
-	logger(LOG_DEBUG, _("End of nodes."));
+	return 0;
 }