Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[tinc] / src / node.c

diff --git a/src/node.c b/src/node.c
index dbc5a7e..38123e2 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -85,6 +85,9 @@ void free_node(node_t *n) {
        cipher_close(&n->outcipher);
        digest_close(&n->outdigest);
 
+       ecdh_free(&n->ecdh);
+       ecdsa_free(&n->ecdsa);
+
        if(timeout_initialized(&n->mtuevent))
                event_del(&n->mtuevent);
        
@@ -157,7 +160,7 @@ 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);
+               ifdebug(PROTOCOL) logger(LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
        } else {
                memset(&n->address, 0, sizeof n->address);
                n->hostname = NULL;
@@ -171,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);