X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=18a02a4ccf0c0355a60f35ec75b476097df04ccc;hb=40c28589328a2aa96c2ce1419c5d90616c758b3d;hp=1f1f94d9625363e4205213fbeb9610c237b6a4b7;hpb=362d8a6358019cb97456c8133832f18798cea41f;p=tinc

diff --git a/src/node.c b/src/node.c
index 1f1f94d9..18a02a4c 100644
--- a/src/node.c
+++ b/src/node.c
@@ -85,7 +85,11 @@ void free_node(node_t *n) {
 	cipher_close(&n->outcipher);
 	digest_close(&n->outdigest);
 
-	event_del(&n->mtuevent);
+	ecdh_free(&n->ecdh);
+	ecdsa_free(&n->ecdsa);
+
+	if(timeout_initialized(&n->mtuevent))
+		event_del(&n->mtuevent);
 	
 	if(n->hostname)
 		free(n->hostname);
@@ -125,7 +129,7 @@ void node_del(node_t *n) {
 }
 
 node_t *lookup_node(char *name) {
-	node_t n = {0};
+	node_t n = {NULL};
 
 	n.name = name;
 
@@ -133,7 +137,7 @@ node_t *lookup_node(char *name) {
 }
 
 node_t *lookup_node_udp(const sockaddr_t *sa) {
-	node_t n = {0};
+	node_t n = {NULL};
 
 	n.address = *sa;
 	n.name = NULL;
@@ -143,7 +147,7 @@ node_t *lookup_node_udp(const sockaddr_t *sa) {
 
 void update_node_udp(node_t *n, const sockaddr_t *sa) {
 	if(n == myself) {
-		logger(LOG_WARNING, "Trying to update UDP address of myself!\n");
+		logger(DEBUG_ALWAYS, LOG_WARNING, "Trying to update UDP address of myself!");
 		return;
 	}
 
@@ -156,11 +160,11 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) {
 		n->address = *sa;
 		n->hostname = sockaddr2hostname(&n->address);
 		splay_insert(node_udp_tree, n);
-		logger(LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
+		logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
 	} else {
 		memset(&n->address, 0, sizeof n->address);
-		n->hostname = 0;
-		ifdebug(PROTOCOL) logger(LOG_DEBUG, "UDP address of %s cleared", n->name);
+		n->hostname = NULL;
+		logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s cleared", n->name);
 	}
 }
 
@@ -170,11 +174,11 @@ bool dump_nodes(connection_t *c) {
 
 	for(node = node_tree->head; node; node = node->next) {
 		n = node->data;
-		send_request(c, "%d %d %s at %s cipher %d digest %d maclength %zd compression %d options %x status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d)", CONTROL, REQ_DUMP_NODES,
+		send_request(c, "%d %d %s at %s cipher %d digest %d maclength %d compression %d options %x status %04x nexthop %s via %s distance %d pmtu %hd (min %hd max %hd)", CONTROL, REQ_DUMP_NODES,
 			   n->name, n->hostname, cipher_get_nid(&n->outcipher),
-			   digest_get_nid(&n->outdigest), digest_length(&n->outdigest), n->outcompression,
+			   digest_get_nid(&n->outdigest), (int)digest_length(&n->outdigest), n->outcompression,
 			   n->options, bitfield_to_int(&n->status, sizeof n->status), n->nexthop ? n->nexthop->name : "-",
-			   n->via ? n->via->name : "-", n->distance, n->mtu, n->minmtu, n->maxmtu);
+			   n->via ? n->via->name ?: "-" : "-", n->distance, n->mtu, n->minmtu, n->maxmtu);
 	}
 
 	return send_request(c, "%d %d", CONTROL, REQ_DUMP_NODES);