X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=b9897e899954b9f1e231a084f08f242680ae93ef;hb=789146757ca0bc630492bf31ae48ede42b7b437a;hp=6a5b747e62ea6fde4602240e6bd66590c5ea5d27;hpb=72136f8418bc7e8a0a5bf3c11215aa49dc679659;p=tinc

diff --git a/src/node.c b/src/node.c
index 6a5b747e..b9897e89 100644
--- a/src/node.c
+++ b/src/node.c
@@ -22,7 +22,6 @@
 
 #include "address_cache.h"
 #include "control_common.h"
-#include "hash.h"
 #include "logger.h"
 #include "net.h"
 #include "netutl.h"
@@ -108,17 +107,9 @@ void free_node(node_t *n) {
 
 	timeout_del(&n->udp_ping_timeout);
 
-	if(n->hostname) {
-		free(n->hostname);
-	}
-
-	if(n->name) {
-		free(n->name);
-	}
-
-	if(n->late) {
-		free(n->late);
-	}
+	free(n->hostname);
+	free(n->name);
+	free(n->late);
 
 	if(n->address_cache) {
 		close_address_cache(n->address_cache);
@@ -152,7 +143,7 @@ void node_del(node_t *n) {
 }
 
 node_t *lookup_node(char *name) {
-	node_t n = {NULL};
+	node_t n = {0};
 
 	n.name = name;
 
@@ -212,16 +203,16 @@ bool dump_nodes(connection_t *c) {
 		}
 
 		id[sizeof(id) - 1] = 0;
-		send_request(c, "%d %d %s %s %s %d %d %d %d %x %x %s %s %d %d %d %d %ld %ld %lu %lu %lu %lu", CONTROL, REQ_DUMP_NODES,
-		             n->name, id, n->hostname ? : "unknown port unknown",
+		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,
+		             n->name, id, n->hostname ? n->hostname : "unknown port unknown",
 #ifdef DISABLE_LEGACY
-		             0, 0, 0,
+		             0, 0, 0UL,
 #else
-		             cipher_get_nid(n->outcipher), digest_get_nid(n->outdigest), (int)digest_length(n->outdigest),
+		             cipher_get_nid(n->outcipher), digest_get_nid(n->outdigest), digest_length(n->outdigest),
 #endif
 		             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, (long)n->last_state_change, (long)n->udp_ping_rtt,
+		             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);
 	}