X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.c;h=5f5d235cf4d28e35929754b38576080ac8fc8836;hb=a5a8005b2d89712e124ab7295165a3e229abdad5;hp=f43619a2a4b2f38fd2cc6e1c2d311eb7c8cef423;hpb=a387ef3cd807b90bbdf39581b6aea1bce9573f19;p=meshlink

diff --git a/src/node.c b/src/node.c
index f43619a2..5f5d235c 100644
--- a/src/node.c
+++ b/src/node.c
@@ -39,45 +39,49 @@ void init_nodes(meshlink_handle_t *mesh) {
 }
 
 void exit_nodes(meshlink_handle_t *mesh) {
-	if(mesh->node_udp_cache)
+	if(mesh->node_udp_cache) {
 		hash_free(mesh->node_udp_cache);
-	if(mesh->nodes)
+	}
+
+	if(mesh->nodes) {
 		splay_delete_tree(mesh->nodes);
+	}
+
 	mesh->node_udp_cache = NULL;
 	mesh->nodes = NULL;
 }
 
 node_t *new_node(void) {
-	node_t *n = xzalloc(sizeof *n);
+	node_t *n = xzalloc(sizeof(*n));
 
-	if(replaywin) n->late = xzalloc(replaywin);
 	n->edge_tree = new_edge_tree();
 	n->mtu = MTU;
 	n->maxmtu = MTU;
+	n->devclass = DEV_CLASS_UNKNOWN;
 
 	return n;
 }
 
 void free_node(node_t *n) {
-	if(n->edge_tree)
+	n->status.destroyed = true;
+
+	utcp_exit(n->utcp);
+
+	if(n->edge_tree) {
 		free_edge_tree(n->edge_tree);
+	}
 
 	sockaddrfree(&n->address);
 
 	ecdsa_free(n->ecdsa);
 	sptps_stop(&n->sptps);
 
-	if(n->mtutimeout.cb)
+	if(n->mtutimeout.cb) {
 		abort();
+	}
 
-	if(n->hostname)
-		free(n->hostname);
-
-	if(n->name)
-		free(n->name);
-
-	if(n->late)
-		free(n->late);
+	free(n->name);
+	free(n->canonical_address);
 
 	free(n);
 }
@@ -90,8 +94,9 @@ void node_add(meshlink_handle_t *mesh, node_t *n) {
 void node_del(meshlink_handle_t *mesh, node_t *n) {
 	timeout_del(&mesh->loop, &n->mtutimeout);
 
-	for splay_each(edge_t, e, n->edge_tree)
+	for splay_each(edge_t, e, n->edge_tree) {
 		edge_del(mesh, e);
+	}
 
 	splay_delete(mesh->nodes, n);
 }
@@ -120,15 +125,22 @@ void update_node_udp(meshlink_handle_t *mesh, node_t *n, const sockaddr_t *sa) {
 	if(sa) {
 		n->address = *sa;
 		n->sock = 0;
+
 		for(int i = 0; i < mesh->listen_sockets; i++) {
 			if(mesh->listen_socket[i].sa.sa.sa_family == sa->sa.sa_family) {
 				n->sock = i;
 				break;
 			}
 		}
+
 		hash_insert(mesh->node_udp_cache, sa, n);
-		free(n->hostname);
-		n->hostname = sockaddr2hostname(&n->address);
-		logger(mesh, MESHLINK_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
+
+		meshlink_hint_address(mesh, (meshlink_node_t *)n, &sa->sa);
+
+		if(mesh->log_level <= MESHLINK_DEBUG) {
+			char *hostname = sockaddr2hostname(&n->address);
+			logger(mesh, MESHLINK_DEBUG, "UDP address of %s set to %s", n->name, hostname);
+			free(hostname);
+		}
 	}
 }