X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;h=69ab8f244ef1e715e171b2b13fd8ff521fb27dab;hb=703197ca7614963ba9b831967352b6c90379af48;hp=f30fcdf3ea680d21fd52289161b36aa3e4575be7;hpb=9dd7e301e61ecf3e15aa6611751515d844fa8dae;p=meshlink

diff --git a/src/meshlink.c b/src/meshlink.c
index f30fcdf3..69ab8f24 100644
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -868,6 +868,18 @@ static void add_local_addresses(meshlink_handle_t *mesh) {
 }
 
 static bool meshlink_setup(meshlink_handle_t *mesh) {
+	if(!config_destroy(mesh->confbase, "new")) {
+		logger(mesh, MESHLINK_ERROR, "Could not delete configuration in %s/new: %s\n", mesh->confbase, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
+
+	if(!config_destroy(mesh->confbase, "old")) {
+		logger(mesh, MESHLINK_ERROR, "Could not delete configuration in %s/old: %s\n", mesh->confbase, strerror(errno));
+		meshlink_errno = MESHLINK_ESTORAGE;
+		return false;
+	}
+
 	if(!config_init(mesh, "current")) {
 		logger(mesh, MESHLINK_ERROR, "Could not set up configuration in %s/current: %s\n", mesh->confbase, strerror(errno));
 		meshlink_errno = MESHLINK_ESTORAGE;
@@ -1501,6 +1513,8 @@ 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;
 
 	pthread_mutex_unlock(&mesh->mutex);
 	return true;
@@ -1515,6 +1529,11 @@ 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);
 
@@ -1676,7 +1695,6 @@ bool meshlink_destroy(const char *confbase) {
 
 	fclose(lockfile);
 
-	/* TODO: do we need to remove confbase? Potential race condition? */
 	if(!sync_path(confbase)) {
 		logger(NULL, MESHLINK_ERROR, "Cannot sync directory %s: %s\n", confbase, strerror(errno));
 		meshlink_errno = MESHLINK_ESTORAGE;
@@ -2025,6 +2043,31 @@ static bool search_node_by_submesh(const node_t *node, const void *condition) {
 	return false;
 }
 
+struct time_range {
+	time_t start;
+	time_t end;
+};
+
+static bool search_node_by_last_reachable(const node_t *node, const void *condition) {
+	const struct time_range *range = condition;
+	time_t start = node->last_reachable;
+	time_t end = node->last_unreachable;
+
+	if(end < start) {
+		end = time(NULL);
+
+		if(end < start) {
+			start = end;
+		}
+	}
+
+	if(range->end >= range->start) {
+		return start <= range->end && end >= range->start;
+	} else {
+		return start > range->start || end < range->end;
+	}
+}
+
 meshlink_node_t **meshlink_get_all_nodes_by_dev_class(meshlink_handle_t *mesh, dev_class_t devclass, meshlink_node_t **nodes, size_t *nmemb) {
 	if(!mesh || devclass < 0 || devclass >= DEV_CLASS_COUNT || !nmemb) {
 		meshlink_errno = MESHLINK_EINVAL;
@@ -2043,6 +2086,17 @@ meshlink_node_t **meshlink_get_all_nodes_by_submesh(meshlink_handle_t *mesh, mes
 	return meshlink_get_all_nodes_by_condition(mesh, submesh, nodes, nmemb, search_node_by_submesh);
 }
 
+meshlink_node_t **meshlink_get_all_nodes_by_last_reachable(meshlink_handle_t *mesh, time_t start, time_t end, meshlink_node_t **nodes, size_t *nmemb) {
+	if(!mesh || !nmemb) {
+		meshlink_errno = MESHLINK_EINVAL;
+		return NULL;
+	}
+
+	struct time_range range = {start, end};
+
+	return meshlink_get_all_nodes_by_condition(mesh, &range, nodes, nmemb, search_node_by_last_reachable);
+}
+
 dev_class_t meshlink_get_node_dev_class(meshlink_handle_t *mesh, meshlink_node_t *node) {
 	if(!mesh || !node) {
 		meshlink_errno = MESHLINK_EINVAL;
@@ -2714,6 +2768,9 @@ char *meshlink_export(meshlink_handle_t *mesh) {
 		packmsg_add_sockaddr(&out, &mesh->self->recent[i]);
 	}
 
+	packmsg_add_int64(&out, 0);
+	packmsg_add_int64(&out, 0);
+
 	pthread_mutex_unlock(&mesh->mutex);
 
 	if(!packmsg_output_ok(&out)) {
@@ -3063,11 +3120,11 @@ void meshlink_hint_address(meshlink_handle_t *mesh, meshlink_node_t *node, const
 	pthread_mutex_lock(&mesh->mutex);
 
 	node_t *n = (node_t *)node;
-	memmove(n->recent + 1, n->recent, (MAX_RECENT - 1) * sizeof(*n->recent));
-	memcpy(n->recent, addr, SALEN(*addr));
 
-	if(!node_write_config(mesh, n)) {
-		logger(mesh, MESHLINK_DEBUG, "Could not update %s\n", n->name);
+	if(node_add_recent_address(mesh, n, (sockaddr_t *)addr)) {
+		if(!node_write_config(mesh, n)) {
+			logger(mesh, MESHLINK_DEBUG, "Could not update %s\n", n->name);
+		}
 	}
 
 	pthread_mutex_unlock(&mesh->mutex);