denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Martin Willi
2006-05-30 14:56:12 +00:00
parent b93782903f
commit 2d6c3bce06
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/queues/event_queue.c
+13 -10
View File
@@ -121,11 +121,12 @@ struct private_event_queue_t {
*/ */
static long time_difference(struct timeval *end_time, struct timeval *start_time) static long time_difference(struct timeval *end_time, struct timeval *start_time)
{ {
long seconds, microseconds; time_t s;
suseconds_t us;
seconds = (end_time->tv_sec - start_time->tv_sec); s = (end_time->tv_sec - start_time->tv_sec);
microseconds = (end_time->tv_usec - start_time->tv_usec); us = (end_time->tv_usec - start_time->tv_usec);
return ((seconds * 1000) + microseconds/1000); return ((s * 1000) + us/1000);
} }
/** /**
@@ -278,13 +279,15 @@ static void add_relative(event_queue_t *this, job_t *job, u_int32_t ms)
{ {
timeval_t current_time; timeval_t current_time;
timeval_t time; timeval_t time;
int micros = ms * 1000;
time_t s = ms / 1000;
suseconds_t us = (ms - s * 1000) * 1000;
gettimeofday(&current_time, NULL); gettimeofday(&current_time, NULL);
time.tv_usec = ((current_time.tv_usec + micros) % 1000000); time.tv_usec = (current_time.tv_usec + us) % 1000000;
time.tv_sec = current_time.tv_sec + ((current_time.tv_usec + micros)/ 1000000); time.tv_sec = current_time.tv_sec + (current_time.tv_usec + us)/1000000 + s;
this->add_absolute(this, job, time); this->add_absolute(this, job, time);
} }