X-Git-Url: http://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnode.c;h=ebd2c7c2c9421d56c1225c89c95f7d593189c278;hb=075e6828a7533e7daa790225f17aa6bb39703278;hp=80d28d64112c8cc49e1ad3616b4fb06cb432c463;hpb=08aabbf9317806bc50a9a6693ca866c8936ce26b;p=tinc

diff --git a/src/node.c b/src/node.c
index 80d28d64..ebd2c7c2 100644
--- a/src/node.c
+++ b/src/node.c
@@ -90,8 +90,10 @@ void free_node(node_t *n) {
 
 	sockaddrfree(&n->address);
 
-	cipher_close(&n->cipher);
-	digest_close(&n->digest);
+	cipher_close(&n->incipher);
+	digest_close(&n->indigest);
+	cipher_close(&n->outcipher);
+	digest_close(&n->outdigest);
 
 	event_del(&n->mtuevent);
 	
@@ -129,6 +131,7 @@ void node_del(node_t *n) {
 		edge_del(e);
 	}
 
+	splay_delete(node_udp_tree, n);
 	splay_delete(node_tree, n);
 }
 
@@ -153,6 +156,25 @@ node_t *lookup_node_udp(const sockaddr_t *sa) {
 	return splay_search(node_udp_tree, &n);
 }
 
+void update_node_udp(node_t *n, const sockaddr_t *sa)
+{
+	splay_delete(node_udp_tree, n);
+
+	if(n->hostname)
+		free(n->hostname);
+
+	if(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);
+	} else {
+		memset(&n->address, 0, sizeof n->address);
+		n->hostname = 0;
+		ifdebug(PROTOCOL) logger(LOG_DEBUG, "UDP address of %s cleared", n->name);
+	}
+}
+
 int dump_nodes(struct evbuffer *out) {
 	splay_node_t *node;
 	node_t *n;
@@ -162,9 +184,9 @@ int dump_nodes(struct evbuffer *out) {
 	for(node = node_tree->head; node; node = node->next) {
 		n = node->data;
 		if(evbuffer_add_printf(out, _(" %s at %s cipher %d digest %d maclength %d compression %d options %lx status %04x nexthop %s via %s distance %d pmtu %d (min %d max %d)\n"),
-			   n->name, n->hostname, cipher_get_nid(&n->cipher),
-			   digest_get_nid(&n->digest), n->maclength, n->compression,
-			   n->options, *(uint32_t *)&n->status, n->nexthop ? n->nexthop->name : "-",
+			   n->name, n->hostname, cipher_get_nid(&n->outcipher),
+			   digest_get_nid(&n->outdigest), 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) == -1)
 			return errno;
 	}