mir/openvswitch
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-10-25 15:07:05 +00:00
Code Issues Releases Wiki Activity

socket-util: Move get_mtime() here from stream-ssl.

Browse Source 
An upcoming commit will add a new user for this function in another file,
so export it and move it to a common library file.
This commit is contained in:
Ben Pfaff
2010-04-21 10:47:45 -07:00
parent cd11000ba2
commit 26efd2563b
3 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lib/socket-util.c
View File

@@ -611,3 +611,31 @@ fsync_parent_dir(const char *file_name)
return error;
}
/* Obtains the modification time of the file named 'file_name' to the greatest
* supported precision. If successful, stores the mtime in '*mtime' and
* returns 0. On error, returns a positive errno value and stores zeros in
* '*mtime'. */
int
get_mtime(const char *file_name, struct timespec *mtime)
{
struct stat s;
if (!stat(file_name, &s)) {
mtime->tv_sec = s.st_mtime;
#if HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
mtime->tv_nsec = s.st_mtim.tv_nsec;
#elif HAVE_STRUCT_STAT_ST_MTIMENSEC
mtime->tv_nsec = s.st_mtimensec;
#else
mtime->tv_nsec = 0;
#endif
return 0;
} else {
mtime->tv_sec = mtime->tv_nsec = 0;
return errno;
}
}

1
lib/socket-util.h
View File

@@ -45,5 +45,6 @@ int read_fully(int fd, void *, size_t, size_t *bytes_read);
int write_fully(int fd, const void *, size_t, size_t *bytes_written);
int fsync_parent_dir(const char *file_name);
int get_mtime(const char *file_name, struct timespec *mtime);
#endif /* socket-util.h */

21
lib/stream-ssl.c
View File

@@ -37,7 +37,6 @@
#include "packets.h"
#include "poll-loop.h"
#include "socket-util.h"
#include "socket-util.h"
#include "util.h"
#include "stream-provider.h"
#include "stream.h"
@@ -915,26 +914,6 @@ stream_ssl_is_configured(void)
return private_key.file_name || certificate.file_name || ca_cert.file_name;
}
static void
get_mtime(const char *file_name, struct timespec *mtime)
{
struct stat s;
if (!stat(file_name, &s)) {
mtime->tv_sec = s.st_mtime;
#if HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
mtime->tv_nsec = s.st_mtim.tv_nsec;
#elif HAVE_STRUCT_STAT_ST_MTIMENSEC
mtime->tv_nsec = s.st_mtimensec;
#else
mtime->tv_nsec = 0;
#endif
} else {
mtime->tv_sec = mtime->tv_nsec = 0;
}
}
static bool
update_ssl_config(struct ssl_config_file *config, const char *file_name)
{