X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fmeshlink.c;fp=src%2Fmeshlink.c;h=164c993784b54e5401f19ba364732d304297c002;hb=f73f697142bd5ce32d9b7273ed73ea798594854d;hp=ebe585d2960eed6c0271e03716507a85972c7c7b;hpb=349d48bd8c9659017ebd2ebf105a14776ceb9c85;p=meshlink diff --git a/src/meshlink.c b/src/meshlink.c index ebe585d2..164c9937 100644 --- a/src/meshlink.c +++ b/src/meshlink.c @@ -661,6 +661,11 @@ 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")) { + return false; + } + sptps_send_record(&(mesh->sptps), 1, ecdsa_get_public_key(mesh->private_key), 32); logger(mesh, MESHLINK_DEBUG, "Configuration stored in: %s\n", mesh->confbase); @@ -890,6 +895,11 @@ static bool meshlink_setup(meshlink_handle_t *mesh) { return false; } + /* Ensure the configuration directory metadata is on disk */ + if(!config_sync(mesh, "current")) { + return false; + } + if(!main_config_lock(mesh)) { logger(NULL, MESHLINK_ERROR, "Cannot lock main config file\n"); meshlink_errno = MESHLINK_ESTORAGE; @@ -2711,6 +2721,10 @@ bool meshlink_import(meshlink_handle_t *mesh, const char *data) { return false; } + if(!config_sync(mesh, "current")) { + return false; + } + return true; } @@ -2740,6 +2754,8 @@ void meshlink_blacklist(meshlink_handle_t *mesh, meshlink_node_t *node) { n->status.blacklisted = true; node_write_config(mesh, n); + config_sync(mesh, "current"); + logger(mesh, MESHLINK_DEBUG, "Blacklisted %s.\n", node->name); //Immediately terminate any connections we have with the blacklisted node @@ -2783,6 +2799,7 @@ void meshlink_whitelist(meshlink_handle_t *mesh, meshlink_node_t *node) { n->status.blacklisted = false; node_write_config(mesh, n); + config_sync(mesh, "current"); pthread_mutex_unlock(&(mesh->mesh_mutex)); return;