X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconf.c;h=bafa87d49c5bd5a563e9d82d5969ca4a51f7ec72;hb=349d48bd8c9659017ebd2ebf105a14776ceb9c85;hp=5db2c016e8c5bfcfcde876207961605a0600c2ad;hpb=1442d234fb6681e32b10348a6c7b226c11629203;p=meshlink

diff --git a/src/conf.c b/src/conf.c
index 5db2c016..bafa87d4 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -206,6 +206,10 @@ static bool copytree(const char *src_dir_name, const void *src_key, const char *
 		return false;
 	}
 
+	char src_filename[PATH_MAX];
+	char dst_filename[PATH_MAX];
+	struct dirent *ent;
+
 	DIR *src_dir = opendir(src_dir_name);
 
 	if(!src_dir) {
@@ -213,29 +217,23 @@ static bool copytree(const char *src_dir_name, const void *src_key, const char *
 		return false;
 	}
 
-	struct dirent *ent;
+	// Delete if already exists and create a new destination directory
+	deltree(dst_dir_name);
+
+	if(mkdir(dst_dir_name, 0700)) {
+		logger(NULL, MESHLINK_ERROR, "Could not create directory %s\n", dst_filename);
+		return false;
+	}
 
 	while((ent = readdir(src_dir))) {
 		if(ent->d_name[0] == '.') {
 			continue;
 		}
 
-		char src_filename[PATH_MAX];
-		char dst_filename[PATH_MAX];
-
 		snprintf(dst_filename, sizeof(dst_filename), "%s" SLASH "%s", dst_dir_name, ent->d_name);
 		snprintf(src_filename, sizeof(src_filename), "%s" SLASH "%s", src_dir_name, ent->d_name);
 
 		if(ent->d_type == DT_DIR) {
-
-			// Delete if already exists and create a new destination directory
-			deltree(dst_filename);
-
-			if(mkdir(dst_filename, 0700)) {
-				logger(NULL, MESHLINK_ERROR, "Could create directory %s\n", dst_filename);
-				return false;
-			}
-
 			if(!copytree(src_filename, src_key, dst_filename, dst_key)) {
 				logger(NULL, MESHLINK_ERROR, "Copying %s to %s failed\n", src_filename, dst_filename);
 				return false;
@@ -244,7 +242,6 @@ static bool copytree(const char *src_dir_name, const void *src_key, const char *
 			if(!sync_path(dst_filename)) {
 				return false;
 			}
-
 		} else if(ent->d_type == DT_REG) {
 			struct stat st;
 			config_t config;
@@ -318,15 +315,6 @@ bool config_copy(meshlink_handle_t *mesh, const char *src_dir_name, const void *
 	snprintf(dst_filename, sizeof(dst_filename), "%s" SLASH "%s", mesh->confbase, dst_dir_name);
 	snprintf(src_filename, sizeof(src_filename), "%s" SLASH "%s", mesh->confbase, src_dir_name);
 
-	if(main_config_exists(mesh, dst_dir_name)) {
-		deltree(dst_dir_name);
-	}
-
-	if(mkdir(dst_filename, 0700)) {
-		logger(NULL, MESHLINK_ERROR, "Could create directory %s\n", dst_filename);
-		return false;
-	}
-
 	return copytree(src_filename, src_key, dst_filename, dst_key);
 }
 
@@ -583,10 +571,7 @@ bool config_read(meshlink_handle_t *mesh, const char *conf_subdir, const char *n
 		return false;
 	}
 
-	if(fclose(f)) {
-		logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", path, strerror(errno));
-		return false;
-	}
+	fclose(f);
 
 	return true;
 }
@@ -631,23 +616,36 @@ bool config_write(meshlink_handle_t *mesh, const char *conf_subdir, const char *
 	}
 
 	char path[PATH_MAX];
+	char tmp_path[PATH_MAX + 4];
 	make_host_path(mesh, conf_subdir, name, path, sizeof(path));
+	snprintf(tmp_path, sizeof(tmp_path), "%s.tmp", path);
 
-	FILE *f = fopen(path, "w");
+	FILE *f = fopen(tmp_path, "w");
 
 	if(!f) {
-		logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", path, strerror(errno));
+		logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", tmp_path, strerror(errno));
 		return false;
 	}
 
 	if(!config_write_file(mesh, f, config, key)) {
-		logger(mesh, MESHLINK_ERROR, "Failed to write `%s': %s", path, strerror(errno));
+		logger(mesh, MESHLINK_ERROR, "Failed to write `%s': %s", tmp_path, strerror(errno));
+		fclose(f);
+		return false;
+	}
+
+	if(fsync(fileno(f))) {
+		logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", tmp_path, strerror(errno));
 		fclose(f);
 		return false;
 	}
 
 	if(fclose(f)) {
-		logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", path, strerror(errno));
+		logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", tmp_path, strerror(errno));
+		return false;
+	}
+
+	if(rename(tmp_path, path)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to rename `%s' to `%s': %s", tmp_path, path, strerror(errno));
 		return false;
 	}
 
@@ -676,10 +674,7 @@ bool main_config_read(meshlink_handle_t *mesh, const char *conf_subdir, config_t
 		return false;
 	}
 
-	if(fclose(f)) {
-		logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", path, strerror(errno));
-		return false;
-	}
+	fclose(f);
 
 	return true;
 }
@@ -691,23 +686,36 @@ bool main_config_write(meshlink_handle_t *mesh, const char *conf_subdir, const c
 	}
 
 	char path[PATH_MAX];
+	char tmp_path[PATH_MAX + 4];
 	make_main_path(mesh, conf_subdir, path, sizeof(path));
+	snprintf(tmp_path, sizeof(tmp_path), "%s.tmp", path);
 
-	FILE *f = fopen(path, "w");
+	FILE *f = fopen(tmp_path, "w");
 
 	if(!f) {
-		logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", path, strerror(errno));
+		logger(mesh, MESHLINK_ERROR, "Failed to open `%s': %s", tmp_path, strerror(errno));
 		return false;
 	}
 
 	if(!config_write_file(mesh, f, config, key)) {
-		logger(mesh, MESHLINK_ERROR, "Failed to write `%s': %s", path, strerror(errno));
+		logger(mesh, MESHLINK_ERROR, "Failed to write `%s': %s", tmp_path, strerror(errno));
+		fclose(f);
+		return false;
+	}
+
+	if(fsync(fileno(f))) {
+		logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", tmp_path, strerror(errno));
 		fclose(f);
 		return false;
 	}
 
+	if(rename(tmp_path, path)) {
+		logger(mesh, MESHLINK_ERROR, "Failed to rename `%s' to `%s': %s", tmp_path, path, strerror(errno));
+		return false;
+	}
+
 	if(fclose(f)) {
-		logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", path, strerror(errno));
+		logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", tmp_path, strerror(errno));
 		return false;
 	}
 
@@ -753,7 +761,7 @@ bool invitation_read(meshlink_handle_t *mesh, const char *conf_subdir, const cha
 		return false;
 	}
 
-	if(time(NULL) > st.st_mtime + mesh->invitation_timeout) {
+	if(mesh->loop.now.tv_sec > st.st_mtime + mesh->invitation_timeout) {
 		logger(mesh, MESHLINK_ERROR, "Peer tried to use an outdated invitation file %s\n", name);
 		fclose(f);
 		unlink(used_path);
@@ -767,10 +775,7 @@ bool invitation_read(meshlink_handle_t *mesh, const char *conf_subdir, const cha
 		return false;
 	}
 
-	if(fclose(f)) {
-		logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", path, strerror(errno));
-		return false;
-	}
+	fclose(f);
 
 	unlink(used_path);
 	return true;
@@ -798,6 +803,11 @@ bool invitation_write(meshlink_handle_t *mesh, const char *conf_subdir, const ch
 		return false;
 	}
 
+	if(fsync(fileno(f))) {
+		logger(mesh, MESHLINK_ERROR, "Failed to sync `%s': %s", path, strerror(errno));
+		return false;
+	}
+
 	if(fclose(f)) {
 		logger(mesh, MESHLINK_ERROR, "Failed to close `%s': %s", path, strerror(errno));
 		return false;