X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=c3f2ab55baf7b30e96bf154dd9f725482f6a8fd2;hb=0f0585d71b28428792e53258bc570dddc17b0b27;hp=a571ae07e653077d46e86ec3a478e7ce006db906;hpb=eeebff55c07c09c5bc5e62a7b2a21f68ecd1c802;p=tinc

diff --git a/src/node.c b/src/node.c
index a571ae07..c3f2ab55 100644
--- a/src/node.c
+++ b/src/node.c
@@ -20,6 +20,7 @@
 
 #include "system.h"
 
+#include "address_cache.h"
 #include "control_common.h"
 #include "hash.h"
 #include "logger.h"
@@ -35,7 +36,6 @@
 splay_tree_t *node_tree;
 static splay_tree_t *node_id_tree;
 static splay_tree_t *node_udp_tree;
-static hash_t *node_id_cache;
 
 node_t *myself;
 
@@ -49,8 +49,11 @@ static int node_id_compare(const node_t *a, const node_t *b) {
 
 static int node_udp_compare(const node_t *a, const node_t *b) {
 	int result = sockaddrcmp(&a->address, &b->address);
-	if (result)
+
+	if(result) {
 		return result;
+	}
+
 	return (a->name && b->name) ? strcmp(a->name, b->name) : 0;
 }
 
@@ -58,34 +61,38 @@ void init_nodes(void) {
 	node_tree = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node);
 	node_id_tree = splay_alloc_tree((splay_compare_t) node_id_compare, NULL);
 	node_udp_tree = splay_alloc_tree((splay_compare_t) node_udp_compare, NULL);
-	node_id_cache = hash_alloc(0x100, sizeof(node_id_t));
 }
 
 void exit_nodes(void) {
-	hash_free(node_id_cache);
 	splay_delete_tree(node_udp_tree);
 	splay_delete_tree(node_id_tree);
 	splay_delete_tree(node_tree);
 }
 
 node_t *new_node(void) {
-	node_t *n = xzalloc(sizeof *n);
+	node_t *n = xzalloc(sizeof(*n));
+
+	if(replaywin) {
+		n->late = xzalloc(replaywin);
+	}
 
-	if(replaywin) n->late = xzalloc(replaywin);
 	n->subnet_tree = new_subnet_tree();
 	n->edge_tree = new_edge_tree();
 	n->mtu = MTU;
 	n->maxmtu = MTU;
+	n->udp_ping_rtt = -1;
 
 	return n;
 }
 
 void free_node(node_t *n) {
-	if(n->subnet_tree)
+	if(n->subnet_tree) {
 		free_subnet_tree(n->subnet_tree);
+	}
 
-	if(n->edge_tree)
+	if(n->edge_tree) {
 		free_edge_tree(n->edge_tree);
+	}
 
 	sockaddrfree(&n->address);
 
@@ -101,22 +108,29 @@ void free_node(node_t *n) {
 
 	timeout_del(&n->udp_ping_timeout);
 
-	if(n->hostname)
+	if(n->hostname) {
 		free(n->hostname);
+	}
 
-	if(n->name)
+	if(n->name) {
 		free(n->name);
+	}
 
-	if(n->late)
+	if(n->late) {
 		free(n->late);
+	}
+
+	if(n->address_cache) {
+		close_address_cache(n->address_cache);
+	}
 
 	free(n);
 }
 
 void node_add(node_t *n) {
 	unsigned char buf[64];
-	sha512(n->name, strlen(n->name),buf);
-	memcpy(&n->id, buf, sizeof n->id);
+	sha512(n->name, strlen(n->name), buf);
+	memcpy(&n->id, buf, sizeof(n->id));
 
 	splay_insert(node_tree, n);
 	splay_insert(node_id_tree, n);
@@ -124,13 +138,14 @@ void node_add(node_t *n) {
 
 void node_del(node_t *n) {
 	splay_delete(node_udp_tree, n);
-	hash_delete(node_id_cache, &n->id);
 
-	for splay_each(subnet_t, s, n->subnet_tree)
+	for splay_each(subnet_t, s, n->subnet_tree) {
 		subnet_del(n, s);
+	}
 
-	for splay_each(edge_t, e, n->edge_tree)
+	for splay_each(edge_t, e, n->edge_tree) {
 		edge_del(e);
+	}
 
 	splay_delete(node_id_tree, n);
 	splay_delete(node_tree, n);
@@ -145,15 +160,8 @@ node_t *lookup_node(char *name) {
 }
 
 node_t *lookup_node_id(const node_id_t *id) {
-	node_t *n = hash_search(node_id_cache, id);
-	if(!n) {
-		node_t tmp = {.id = *id};
-		n = splay_search(node_id_tree, &tmp);
-		if(n)
-			hash_insert(node_id_cache, id, n);
-	}
-
-	return n;
+	node_t n = {.id = *id};
+	return splay_search(node_id_tree, &n);
 }
 
 node_t *lookup_node_udp(const sockaddr_t *sa) {
@@ -172,12 +180,14 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) {
 	if(sa) {
 		n->address = *sa;
 		n->sock = 0;
+
 		for(int i = 0; i < listen_sockets; i++) {
 			if(listen_socket[i].sa.sa.sa_family == sa->sa.sa_family) {
 				n->sock = i;
 				break;
 			}
 		}
+
 		splay_insert(node_udp_tree, n);
 		free(n->hostname);
 		n->hostname = sockaddr2hostname(&n->address);
@@ -195,20 +205,23 @@ void update_node_udp(node_t *n, const sockaddr_t *sa) {
 
 bool dump_nodes(connection_t *c) {
 	for splay_each(node_t, n, node_tree) {
-		char id[2 * sizeof n->id + 1];
-		for (size_t c = 0; c < sizeof n->id; ++c)
-			sprintf(id + 2 * c, "%02hhx", n->id.x[c]);
-		id[sizeof id - 1] = 0;
-		send_request(c, "%d %d %s %s %s %d %d %d %d %x %x %s %s %d %hd %hd %hd %ld", CONTROL, REQ_DUMP_NODES,
-			   n->name, id, n->hostname ?: "unknown port unknown",
+		char id[2 * sizeof(n->id) + 1];
+
+		for(size_t c = 0; c < sizeof(n->id); ++c) {
+			snprintf(id + 2 * c, 3, "%02x", n->id.x[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", CONTROL, REQ_DUMP_NODES,
+		             n->name, id, n->hostname ? : "unknown port unknown",
 #ifdef DISABLE_LEGACY
-			   0, 0, 0,
+		             0, 0, 0,
 #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), (int)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);
+		             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);
 	}
 
 	return send_request(c, "%d %d", CONTROL, REQ_DUMP_NODES);
@@ -217,7 +230,7 @@ bool dump_nodes(connection_t *c) {
 bool dump_traffic(connection_t *c) {
 	for splay_each(node_t, n, node_tree)
 		send_request(c, "%d %d %s %"PRIu64" %"PRIu64" %"PRIu64" %"PRIu64, CONTROL, REQ_DUMP_TRAFFIC,
-			   n->name, n->in_packets, n->in_bytes, n->out_packets, n->out_bytes);
+		             n->name, n->in_packets, n->in_bytes, n->out_packets, n->out_bytes);
 
 	return send_request(c, "%d %d", CONTROL, REQ_DUMP_TRAFFIC);
 }