diff options
author | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2005-11-09 21:13:57 +0000 |
---|---|---|
committer | james <james@e7ae566f-a301-0410-adde-c780ea21d3b5> | 2005-11-09 21:13:57 +0000 |
commit | 9423103dab10cd5b933e4f6e574f37e33457ca96 (patch) | |
tree | 014ae81167ddf95ff33cb4e6859d4dc8582ce998 | |
parent | Fixed update_time to use a better algorithm for (diff) | |
download | openvpn-9423103dab10cd5b933e4f6e574f37e33457ca96.tar.xz |
Backed out change to update_time to handle time
backtracks. Will reimplement as a more comprehensive
patch.
git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@790 e7ae566f-a301-0410-adde-c780ea21d3b5
-rw-r--r-- | otime.c | 1 | ||||
-rw-r--r-- | otime.h | 7 |
2 files changed, 2 insertions, 6 deletions
@@ -35,7 +35,6 @@ #include "memdbg.h" volatile time_t now; /* GLOBAL */ -unsigned int now_adj = 0; /* GLOBAL */ /* * Return a numerical string describing a struct timeval. @@ -55,16 +55,13 @@ const char *tv_string (const struct timeval *tv, struct gc_arena *gc); const char *tv_string_abs (const struct timeval *tv, struct gc_arena *gc); extern volatile time_t now; /* updated frequently to time(NULL) */ -extern unsigned int now_adj; static inline void update_time (void) { - const time_t real_time = time (NULL) + now_adj; - if (real_time > now) + const time_t real_time = time (NULL); + if (real_time != now) now = real_time; - else if (real_time < now) - now_adj += (now - real_time); } static inline void |