Update UTCP and replace gettimeofday() with clock_gettime().

[meshlink] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 9cf76fbea7de8bd5dbda8a8a32e362b607674cc4..7cf923bc88b087c1c9da0821146780a305977379 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -397,7 +397,7 @@ bool config_rename(meshlink_handle_t *mesh, const char *old_conf_subdir, const c
        snprintf(old_path, sizeof(old_path), "%s" SLASH "%s", mesh->confbase, old_conf_subdir);
        snprintf(new_path, sizeof(new_path), "%s" SLASH "%s", mesh->confbase, new_conf_subdir);
 
-       return rename(old_path, new_path) == 0;
+       return rename(old_path, new_path) == 0 && sync_path(mesh->confbase);
 }
 
 bool config_sync(meshlink_handle_t *mesh, const char *conf_subdir) {
@@ -903,7 +903,7 @@ bool invitation_read(meshlink_handle_t *mesh, const char *conf_subdir, const cha
                return false;
        }
 
-       if(mesh->loop.now.tv_sec >= st.st_mtime + mesh->invitation_timeout) {
+       if(time(NULL) >= 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);