X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=cba598d404dcc2ff15e14a01974f90056eb8fcbe;hb=refs%2Fheads%2F1.0-gnutls;hp=f40fb19ed26a403b62ed619eba6cd09beb31171f;hpb=72bdc05cb7e246e56ed21a25256d441c45fccca8;p=tinc

diff --git a/src/node.c b/src/node.c
index f40fb19e..cba598d4 100644
--- 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.
 
-    $Id: node.c,v 1.1.2.27 2003/08/22 11:18:42 guus Exp $
+    $Id: node.c,v 1.1.2.31 2003/12/22 11:04:16 guus Exp $
 */
 
 #include "system.h"
@@ -72,14 +72,15 @@ void exit_nodes(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();
 
 	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;
 }
@@ -97,8 +98,11 @@ void free_node(node_t *n)
 	if(n->hostname)
 		free(n->hostname);
 
-	if(n->key)
-		free(n->key);
+	if(n->cipherkey)
+		free(n->cipherkey);
+
+	if(n->digestkey)
+		free(n->digestkey);
 
 	if(n->subnet_tree)
 		free_subnet_tree(n->subnet_tree);
@@ -108,7 +112,8 @@ void free_node(node_t *n)
 
 	sockaddrfree(&n->address);
 
-	EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
+	if(n->mtuevent)
+		event_del(n->mtuevent);
 	
 	free(n);
 }
@@ -131,13 +136,13 @@ void node_del(node_t *n)
 
 	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;
-		e = (edge_t *) node->data;
+		e = node->data;
 		edge_del(e);
 	}
 
@@ -178,12 +183,12 @@ void dump_nodes(void)
 	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->name, n->hostname, n->cipher ? n->cipher->nid : 0,
-			   n->digest ? n->digest->type : 0, n->maclength, n->compression,
+		n = node->data;
+		logger(LOG_DEBUG, _(" %s at %s cipher %s digest %s maclength %d compression %d options %lx status %04x nexthop %s via %s pmtu %d (min %d max %d)"),
+			   n->name, n->hostname, gcry_cipher_algo_name(n->cipher),
+			   gcry_md_algo_name(n->digest), n->maclength, n->compression,
 			   n->options, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-",
-			   n->via ? n->via->name : "-");
+			   n->via ? n->via->name : "-", n->mtu, n->minmtu, n->maxmtu);
 	}
 
 	logger(LOG_DEBUG, _("End of nodes."));