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

diff --git a/src/meshlink.c b/src/meshlink.c
index 75458fe6..f30fcdf3 100644
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -662,7 +662,7 @@ static bool finalize_join(meshlink_handle_t *mesh, const void *buf, uint16_t len
 	}
 
 	/* Ensure the configuration directory metadata is on disk */
-	if(!config_sync(mesh, "current")) {
+	if(!config_sync(mesh, "current") || !sync_path(mesh->confbase)) {
 		return false;
 	}
 
@@ -1904,17 +1904,17 @@ meshlink_node_t *meshlink_get_node(meshlink_handle_t *mesh, const char *name) {
 		return NULL;
 	}
 
-	meshlink_node_t *node = NULL;
+	node_t *n = NULL;
 
 	pthread_mutex_lock(&mesh->mutex);
-	node = (meshlink_node_t *)lookup_node(mesh, (char *)name); // TODO: make lookup_node() use const
+	n = lookup_node(mesh, (char *)name); // TODO: make lookup_node() use const
 	pthread_mutex_unlock(&mesh->mutex);
 
-	if(!node) {
+	if(!n) {
 		meshlink_errno = MESHLINK_ENOENT;
 	}
 
-	return node;
+	return (meshlink_node_t *)n;
 }
 
 meshlink_submesh_t *meshlink_get_submesh(meshlink_handle_t *mesh, const char *name) {
@@ -1975,8 +1975,8 @@ static meshlink_node_t **meshlink_get_all_nodes_by_condition(meshlink_handle_t *
 	*nmemb = 0;
 
 	for splay_each(node_t, n, mesh->nodes) {
-		if(true == search_node(n, condition)) {
-			*nmemb = *nmemb + 1;
+		if(search_node(n, condition)) {
+			++*nmemb;
 		}
 	}
 
@@ -1992,7 +1992,7 @@ static meshlink_node_t **meshlink_get_all_nodes_by_condition(meshlink_handle_t *
 		meshlink_node_t **p = result;
 
 		for splay_each(node_t, n, mesh->nodes) {
-			if(true == search_node(n, condition)) {
+			if(search_node(n, condition)) {
 				*p++ = (meshlink_node_t *)n;
 			}
 		}
@@ -2700,7 +2700,7 @@ char *meshlink_export(meshlink_handle_t *mesh) {
 
 	uint32_t count = 0;
 
-	for(uint32_t i = 0; i < 5; i++) {
+	for(uint32_t i = 0; i < MAX_RECENT; i++) {
 		if(mesh->self->recent[i].sa.sa_family) {
 			count++;
 		} else {
@@ -2837,27 +2837,15 @@ bool meshlink_import(meshlink_handle_t *mesh, const char *data) {
 	return true;
 }
 
-bool meshlink_blacklist(meshlink_handle_t *mesh, meshlink_node_t *node) {
-	if(!mesh || !node) {
-		meshlink_errno = MESHLINK_EINVAL;
-		return false;
-	}
-
-	pthread_mutex_lock(&mesh->mutex);
-
-	node_t *n;
-	n = (node_t *)node;
-
+static bool blacklist(meshlink_handle_t *mesh, node_t *n) {
 	if(n == mesh->self) {
-		logger(mesh, MESHLINK_ERROR, "%s blacklisting itself?\n", node->name);
+		logger(mesh, MESHLINK_ERROR, "%s blacklisting itself?\n", n->name);
 		meshlink_errno = MESHLINK_EINVAL;
-		pthread_mutex_unlock(&mesh->mutex);
 		return false;
 	}
 
 	if(n->status.blacklisted) {
-		logger(mesh, MESHLINK_DEBUG, "Node %s already blacklisted\n", node->name);
-		pthread_mutex_unlock(&mesh->mutex);
+		logger(mesh, MESHLINK_DEBUG, "Node %s already blacklisted\n", n->name);
 		return true;
 	}
 
@@ -2880,38 +2868,71 @@ bool meshlink_blacklist(meshlink_handle_t *mesh, meshlink_node_t *node) {
 	n->mtuprobes = 0;
 	n->status.udp_confirmed = false;
 
-	if(!node_write_config(mesh, n)) {
-		pthread_mutex_unlock(&mesh->mutex);
+	/* Graph updates will suppress status updates for blacklisted nodes, so we need to
+	 * manually call the status callback if necessary.
+	 */
+	if(n->status.reachable && mesh->node_status_cb) {
+		mesh->node_status_cb(mesh, (meshlink_node_t *)n, false);
+	}
+
+	return node_write_config(mesh, n) && config_sync(mesh, "current");
+}
+
+bool meshlink_blacklist(meshlink_handle_t *mesh, meshlink_node_t *node) {
+	if(!mesh || !node) {
+		meshlink_errno = MESHLINK_EINVAL;
 		return false;
 	}
 
-	logger(mesh, MESHLINK_DEBUG, "Blacklisted %s.\n", node->name);
+	pthread_mutex_lock(&mesh->mutex);
+
+	if(!blacklist(mesh, (node_t *)node)) {
+		pthread_mutex_unlock(&mesh->mutex);
+		return false;
+	}
 
 	pthread_mutex_unlock(&mesh->mutex);
 
-	return config_sync(mesh, "current");
+	logger(mesh, MESHLINK_DEBUG, "Blacklisted %s.\n", node->name);
+	return true;
 }
 
-bool meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) {
-	if(!mesh || !node) {
+bool meshlink_blacklist_by_name(meshlink_handle_t *mesh, const char *name) {
+	if(!mesh || !name) {
 		meshlink_errno = MESHLINK_EINVAL;
 		return false;
 	}
 
 	pthread_mutex_lock(&mesh->mutex);
 
-	node_t *n = (node_t *)node;
+	node_t *n = lookup_node(mesh, (char *)name);
+
+	if(!n) {
+		n = new_node();
+		n->name = xstrdup(name);
+		node_add(mesh, n);
+	}
+
+	if(!blacklist(mesh, (node_t *)n)) {
+		pthread_mutex_unlock(&mesh->mutex);
+		return false;
+	}
+
+	pthread_mutex_unlock(&mesh->mutex);
 
+	logger(mesh, MESHLINK_DEBUG, "Blacklisted %s.\n", name);
+	return true;
+}
+
+static bool whitelist(meshlink_handle_t *mesh, node_t *n) {
 	if(n == mesh->self) {
-		logger(mesh, MESHLINK_ERROR, "%s whitelisting itself?\n", node->name);
+		logger(mesh, MESHLINK_ERROR, "%s whitelisting itself?\n", n->name);
 		meshlink_errno = MESHLINK_EINVAL;
-		pthread_mutex_unlock(&mesh->mutex);
 		return false;
 	}
 
 	if(!n->status.blacklisted) {
-		logger(mesh, MESHLINK_DEBUG, "Node %s was already whitelisted\n", node->name);
-		pthread_mutex_unlock(&mesh->mutex);
+		logger(mesh, MESHLINK_DEBUG, "Node %s was already whitelisted\n", n->name);
 		return true;
 	}
 
@@ -2921,22 +2942,115 @@ bool meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) {
 		update_node_status(mesh, n);
 	}
 
-	if(!node_write_config(mesh, n)) {
+	return node_write_config(mesh, n) && config_sync(mesh, "current");
+}
+
+bool meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) {
+	if(!mesh || !node) {
+		meshlink_errno = MESHLINK_EINVAL;
+		return false;
+	}
+
+	pthread_mutex_lock(&mesh->mutex);
+
+	if(!whitelist(mesh, (node_t *)node)) {
 		pthread_mutex_unlock(&mesh->mutex);
 		return false;
 	}
 
+	pthread_mutex_unlock(&mesh->mutex);
+
 	logger(mesh, MESHLINK_DEBUG, "Whitelisted %s.\n", node->name);
+	return true;
+}
+
+bool meshlink_whitelist_by_name(meshlink_handle_t *mesh, const char *name) {
+	if(!mesh || !name) {
+		meshlink_errno = MESHLINK_EINVAL;
+		return false;
+	}
+
+	pthread_mutex_lock(&mesh->mutex);
+
+	node_t *n = lookup_node(mesh, (char *)name);
+
+	if(!n) {
+		n = new_node();
+		n->name = xstrdup(name);
+		node_add(mesh, n);
+	}
+
+	if(!whitelist(mesh, (node_t *)n)) {
+		pthread_mutex_unlock(&mesh->mutex);
+		return false;
+	}
 
 	pthread_mutex_unlock(&mesh->mutex);
 
-	return config_sync(mesh, "current");
+	logger(mesh, MESHLINK_DEBUG, "Whitelisted %s.\n", name);
+	return true;
 }
 
 void meshlink_set_default_blacklist(meshlink_handle_t *mesh, bool blacklist) {
 	mesh->default_blacklist = blacklist;
 }
 
+bool meshlink_forget_node(meshlink_handle_t *mesh, meshlink_node_t *node) {
+	if(!mesh || !node) {
+		meshlink_errno = MESHLINK_EINVAL;
+		return false;
+	}
+
+	node_t *n = (node_t *)node;
+
+	pthread_mutex_lock(&mesh->mutex);
+
+	/* Check that the node is not reachable */
+	if(n->status.reachable || n->connection) {
+		pthread_mutex_unlock(&mesh->mutex);
+		logger(mesh, MESHLINK_WARNING, "Could not forget %s: still reachable", n->name);
+		return false;
+	}
+
+	/* Check that we don't have any active UTCP connections */
+	if(n->utcp && utcp_is_active(n->utcp)) {
+		pthread_mutex_unlock(&mesh->mutex);
+		logger(mesh, MESHLINK_WARNING, "Could not forget %s: active UTCP connections", n->name);
+		return false;
+	}
+
+	/* Check that we have no active connections to this node */
+	for list_each(connection_t, c, mesh->connections) {
+		if(c->node == n) {
+			pthread_mutex_unlock(&mesh->mutex);
+			logger(mesh, MESHLINK_WARNING, "Could not forget %s: active connection", n->name);
+			return false;
+		}
+	}
+
+	/* Remove any pending outgoings to this node */
+	if(mesh->outgoings) {
+		for list_each(outgoing_t, outgoing, mesh->outgoings) {
+			if(outgoing->node == n) {
+				list_delete_node(mesh->outgoings, node);
+			}
+		}
+	}
+
+	/* Delete the config file for this node */
+	if(!config_delete(mesh, "current", n->name)) {
+		pthread_mutex_unlock(&mesh->mutex);
+		return false;
+	}
+
+	/* Delete the node struct and any remaining edges referencing this node */
+	node_del(mesh, n);
+
+	pthread_mutex_unlock(&mesh->mutex);
+
+	return config_sync(mesh, "current");
+}
+
 /* Hint that a hostname may be found at an address
  * See header file for detailed comment.
  */
@@ -2949,7 +3063,7 @@ 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, 4 * sizeof(*n->recent));
+	memmove(n->recent + 1, n->recent, (MAX_RECENT - 1) * sizeof(*n->recent));
 	memcpy(n->recent, addr, SALEN(*addr));
 
 	if(!node_write_config(mesh, n)) {