X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=a71a87356804a6e3e7bb50b676f29dd75f7fe894;hb=911c05f873ad967c40d04aa7347b1067fe62c055;hp=0960ca761c32595b940103091459c0a8ec852090;hpb=6eaefb4dbce240334e35f67d9f3db5d4f44e49c9;p=tinc

diff --git a/src/node.c b/src/node.c
index 0960ca76..a71a8735 100644
--- a/src/node.c
+++ b/src/node.c
@@ -67,14 +67,13 @@ void exit_nodes(void) {
 }
 
 node_t *new_node(void) {
-	node_t *n = xmalloc_and_zero(sizeof(*n));
+	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);
-	EVP_CIPHER_CTX_init(&n->packet_ctx);
 	n->mtu = MTU;
 	n->maxmtu = MTU;
 
@@ -87,9 +86,6 @@ 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);
 
@@ -98,7 +94,8 @@ void free_node(node_t *n) {
 
 	sockaddrfree(&n->address);
 
-	EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
+	cipher_close(&n->cipher);
+	digest_close(&n->digest);
 
 	event_del(&n->mtuevent);
 	
@@ -168,11 +165,11 @@ int dump_nodes(struct evbuffer *out) {
 
 	for(node = node_tree->head; node; node = node->next) {
 		n = node->data;
-		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,
+		if(evbuffer_add_printf(out, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d)\n"),
+			   n->name, n->hostname, cipher_get_nid(&n->cipher),
+			   digest_get_nid(&n->digest), 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) == -1)
+			   n->via ? n->via->name : "-", n->distance, n->mtu, n->minmtu, n->maxmtu) == -1)
 			return errno;
 	}