X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=3e37b8eb774c90f8dcff0bb4efc0e65db4ebb734;hb=c6a15e27d934e90a1f3a26438dddb395bdc9de19;hp=fce1217ee6912c363f3d4f5891f9897af312e487;hpb=28b7a53b693f6b4e70218a926e68a36ece54cda1;p=tinc diff --git a/src/node.c b/src/node.c index fce1217e..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_free(&n->incipher); - digest_free(&n->indigest); - cipher_free(&n->outcipher); - digest_free(&n->outdigest); + cipher_free(n->incipher); + digest_free(n->indigest); + cipher_free(n->outcipher); + digest_free(n->outdigest); #endif ecdsa_free(n->ecdsa); @@ -209,7 +214,7 @@ bool dump_nodes(connection_t *c) { #else 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);