X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=3e37b8eb774c90f8dcff0bb4efc0e65db4ebb734;hb=1aa8ac8c41ab8580fce1956086d7e6c7e84a09ee;hp=4caf992dd83e9e3ba01380a58884540e3be423fd;hpb=914d1be411229c28e6e8e4a0df99afa076a8b448;p=tinc

diff --git a/src/node.c b/src/node.c
index 4caf992d..3e37b8eb 100644
--- a/src/node.c
+++ b/src/node.c
@@ -71,7 +71,7 @@ void exit_nodes(void) {
 	splay_empty_tree(&node_tree);
 }
 
-node_t *new_node(void) {
+node_t *new_node(const char *name) {
 	node_t *n = xzalloc(sizeof(*n));
 
 	if(replaywin) {
@@ -84,21 +84,26 @@ node_t *new_node(void) {
 	n->mtu = MTU;
 	n->maxmtu = MTU;
 	n->udp_ping_rtt = -1;
+	n->name = xstrdup(name);
 
 	return n;
 }
 
 void free_node(node_t *n) {
+	if(!n) {
+		return;
+	}
+
 	splay_empty_tree(&n->subnet_tree);
 	splay_empty_tree(&n->edge_tree);
 
 	sockaddrfree(&n->address);
 
 #ifndef DISABLE_LEGACY
-	cipher_close(n->incipher);
-	digest_close(n->indigest);
-	cipher_close(n->outcipher);
-	digest_close(n->outdigest);
+	cipher_free(n->incipher);
+	digest_free(n->indigest);
+	cipher_free(n->outcipher);
+	digest_free(n->outdigest);
 #endif
 
 	ecdsa_free(n->ecdsa);
@@ -202,14 +207,14 @@ bool dump_nodes(connection_t *c) {
 		}
 
 		id[sizeof(id) - 1] = 0;
-		send_request(c, "%d %d %s %s %s %d %d %zu %d %x %x %s %s %d %d %d %d %ld %d %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, CONTROL, REQ_DUMP_NODES,
+		send_request(c, "%d %d %s %s %s %d %d %lu %d %x %x %s %s %d %d %d %d %ld %d %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, CONTROL, REQ_DUMP_NODES,
 		             n->name, id, n->hostname ? n->hostname : "unknown port unknown",
 #ifdef DISABLE_LEGACY
 		             0, 0, 0UL,
 #else
-		             cipher_get_nid(n->outcipher), digest_get_nid(n->outdigest), digest_length(n->outdigest),
+		             cipher_get_nid(n->outcipher), digest_get_nid(n->outdigest), (unsigned long)digest_length(n->outdigest),
 #endif
-		             n->outcompression, n->options, bitfield_to_int(&n->status, sizeof(n->status)),
+		             n->outcompression, n->options, n->status.value,
 		             n->nexthop ? n->nexthop->name : "-", n->via && n->via->name ? n->via->name : "-", n->distance,
 		             n->mtu, n->minmtu, n->maxmtu, (long)n->last_state_change, n->udp_ping_rtt,
 		             n->in_packets, n->in_bytes, n->out_packets, n->out_bytes);