X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=d1987ab8c1ebfe36deb62cec72c043e814f6ef48;hb=8c5cd31cecf9d91d362199dc89effcfe59072e13;hp=2d4c2e1f2beb1c218eebd5343be2f6aa75cb8644;hpb=be83b0af60449c7b35d17d97f2e6dc12f611e831;p=meshlink

diff --git a/src/meshlink.c b/src/meshlink.c
index 2d4c2e1f..d1987ab8 100644
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -37,6 +37,7 @@
 #include "ed25519/sha512.h"
 #include "discovery.h"
 #include "devtools.h"
+#include "graph.h"
 
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
@@ -667,6 +668,10 @@ static bool finalize_join(meshlink_handle_t *mesh, const void *buf, uint16_t len
 			}
 		}
 
+		/* Clear the reachability times, since we ourself have never seen these nodes yet */
+		n->last_reachable = 0;
+		n->last_unreachable = 0;
+
 		if(!node_write_config(mesh, n)) {
 			free_node(n);
 			return false;
@@ -719,7 +724,7 @@ static bool invitation_receive(void *handle, uint8_t type, const void *msg, uint
 		return finalize_join(mesh, msg, len);
 
 	case 1:
-		logger(mesh, MESHLINK_DEBUG, "Invitation succesfully accepted.\n");
+		logger(mesh, MESHLINK_DEBUG, "Invitation successfully accepted.\n");
 		shutdown(mesh->sock, SHUT_RDWR);
 		mesh->success = true;
 		break;
@@ -1527,8 +1532,9 @@ bool meshlink_start(meshlink_handle_t *mesh) {
 
 	pthread_cond_wait(&mesh->cond, &mesh->mutex);
 	mesh->threadstarted = true;
-	mesh->self->last_reachable = time(NULL);
-	mesh->self->status.dirty = true;
+
+	// Ensure we are considered reachable
+	graph(mesh);
 
 	pthread_mutex_unlock(&mesh->mutex);
 	return true;
@@ -1543,11 +1549,6 @@ void meshlink_stop(meshlink_handle_t *mesh) {
 	pthread_mutex_lock(&mesh->mutex);
 	logger(mesh, MESHLINK_DEBUG, "meshlink_stop called\n");
 
-	if(mesh->self) {
-		mesh->self->last_unreachable = time(NULL);
-		mesh->self->status.dirty = true;
-	}
-
 	// Shut down the main thread
 	event_loop_stop(&mesh->loop);
 
@@ -1587,6 +1588,11 @@ void meshlink_stop(meshlink_handle_t *mesh) {
 
 	exit_outgoings(mesh);
 
+	// Ensure we are considered unreachable
+	if(mesh->nodes) {
+		graph(mesh);
+	}
+
 	// Try to write out any changed node config files, ignore errors at this point.
 	if(mesh->nodes) {
 		for splay_each(node_t, n, mesh->nodes) {
@@ -2153,7 +2159,7 @@ bool meshlink_get_node_reachability(struct meshlink_handle *mesh, struct meshlin
 	bool reachable;
 
 	pthread_mutex_lock(&mesh->mutex);
-	reachable = n->status.reachable;
+	reachable = n->status.reachable && !n->status.blacklisted;
 
 	if(last_reachable) {
 		*last_reachable = n->last_reachable;
@@ -2426,7 +2432,7 @@ char *meshlink_invite_ex(meshlink_handle_t *mesh, meshlink_submesh_t *submesh, c
 	}
 
 	// Ensure no other nodes know about this name
-	if(meshlink_get_node(mesh, name)) {
+	if(lookup_node(mesh, name)) {
 		logger(mesh, MESHLINK_ERROR, "A node with name %s is already known!\n", name);
 		meshlink_errno = MESHLINK_EEXIST;
 		pthread_mutex_unlock(&mesh->mutex);
@@ -2452,7 +2458,7 @@ char *meshlink_invite_ex(meshlink_handle_t *mesh, meshlink_submesh_t *submesh, c
 	// If we changed our own host config file, write it out now
 	if(mesh->self->status.dirty) {
 		if(!node_write_config(mesh, mesh->self)) {
-			logger(mesh, MESHLINK_ERROR, "Could not write our own host conifg file!\n");
+			logger(mesh, MESHLINK_ERROR, "Could not write our own host config file!\n");
 			pthread_mutex_unlock(&mesh->mutex);
 			return NULL;
 		}
@@ -2973,6 +2979,10 @@ static bool blacklist(meshlink_handle_t *mesh, node_t *n) {
 	n->mtuprobes = 0;
 	n->status.udp_confirmed = false;
 
+	if(n->status.reachable) {
+		n->last_unreachable = mesh->loop.now.tv_sec;
+	}
+
 	/* Graph updates will suppress status updates for blacklisted nodes, so we need to
 	 * manually call the status callback if necessary.
 	 */
@@ -3044,6 +3054,7 @@ static bool whitelist(meshlink_handle_t *mesh, node_t *n) {
 	n->status.blacklisted = false;
 
 	if(n->status.reachable) {
+		n->last_reachable = mesh->loop.now.tv_sec;
 		update_node_status(mesh, n);
 	}