X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnode.c;h=4f4f599932caa1d6985afdc689b1a9d43b670310;hb=ae73e19ce57b80c561b81170ab48f3cf6f1a41eb;hp=164fdb159e701b8da13785b4c0ceb90e2e67792b;hpb=ea294dac41365a08a77b64c62c0ba630292d7a07;p=meshlink

diff --git a/src/node.c b/src/node.c
index 164fdb15..4f4f5999 100644
--- a/src/node.c
+++ b/src/node.c
@@ -39,10 +39,14 @@ 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;
 }
@@ -61,21 +65,23 @@ node_t *new_node(void) {
 void free_node(node_t *n) {
 	n->status.destroyed = true;
 
-	if(n->edge_tree)
+	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();
+	}
 
 	free(n->name);
 
-	utcp_exit(n->utcp);
-
 	free(n);
 }
 
@@ -87,8 +93,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);
 }
@@ -117,6 +124,7 @@ 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;