X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcutil%2Fsilctime.c;h=b2f84c3c6af68afd9ad2fc169e1494f8759cc8db;hb=9905799a86c606304fd7df2cd401de1740a272a1;hp=9eb3ae43b1bbb9be3197215464c03e7f790d2123;hpb=c27a4ecc3e616e8a5ee09b8ca888ed6ff3e501f7;p=silc.git diff --git a/lib/silcutil/silctime.c b/lib/silcutil/silctime.c index 9eb3ae43..b2f84c3c 100644 --- a/lib/silcutil/silctime.c +++ b/lib/silcutil/silctime.c @@ -4,7 +4,7 @@ Author: Pekka Riikonen - Copyright (C) 2003 - 2005 Pekka Riikonen + Copyright (C) 2003 - 2006 Pekka Riikonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,7 +17,44 @@ */ -#include "silcincludes.h" +#include "silc.h" + +/* Fills the SilcTime structure with correct values */ + +static SilcBool silc_time_fill(SilcTime time, + unsigned int year, + unsigned int month, + unsigned int day, + unsigned int hour, + unsigned int minute, + unsigned int second, + unsigned int msec) +{ + if (year > (1 << 15)) + return FALSE; + if (month < 1 || month > 12) + return FALSE; + if (day < 1 || day > 31) + return FALSE; + if (hour > 23) + return FALSE; + if (minute > 60) + return FALSE; + if (second > 61) + return FALSE; + if (msec > 1000) + return FALSE; + + time->year = year; + time->month = month; + time->day = day; + time->hour = hour; + time->minute = minute; + time->second = second; + time->msecond = msec; + + return TRUE; +} /* Return time since Epoch */ @@ -26,17 +63,35 @@ SilcInt64 silc_time(void) return (SilcInt64)time(NULL); } +/* Return time since Epoch in milliseconds */ + +SilcInt64 silc_time_msec(void) +{ + struct timeval curtime; + silc_gettimeofday(&curtime); + return (curtime.tv_sec * 1000) + (curtime.tv_usec / 1000); +} + +/* Return time since Epoch in microseconds */ + +SilcInt64 silc_time_usec(void) +{ + struct timeval curtime; + silc_gettimeofday(&curtime); + return (curtime.tv_sec * 1000000) + curtime.tv_usec; +} + /* Returns time as string */ -const char *silc_time_string(SilcInt64 timeval) +const char *silc_time_string(SilcInt64 time_val) { time_t curtime; char *return_time; - if (!timeval) - curtime = time(NULL); + if (!time_val) + curtime = silc_time(); else - curtime = (time_t)timeval; + curtime = (time_t)time_val; return_time = ctime(&curtime); if (!return_time) return NULL; @@ -47,29 +102,31 @@ const char *silc_time_string(SilcInt64 timeval) /* Returns time as SilcTime structure */ -SilcBool silc_time_value(SilcInt64 timeval, SilcTime ret_time) +SilcBool silc_time_value(SilcInt64 time_val, SilcTime ret_time) { struct tm *time; + unsigned int msec = 0; if (!ret_time) return TRUE; - if (!timeval) - timeval = silc_time(); + if (!time_val) + time_val = silc_time_msec(); - time = localtime((time_t *)&timeval); + msec = time_val % 1000; + time_val /= 1000; + + time = localtime((time_t *)&time_val); if (!time) return FALSE; memset(ret_time, 0, sizeof(*ret_time)); - ret_time->year = time->tm_year + 1900; - ret_time->month = time->tm_mon + 1; - ret_time->day = time->tm_mday; - ret_time->hour = time->tm_hour; - ret_time->minute = time->tm_min; - ret_time->second = time->tm_sec; - ret_time->dst = time->tm_isdst ? 1 : 0; + if (!silc_time_fill(ret_time, time->tm_year + 1900, time->tm_mon + 1, + time->tm_mday, time->tm_hour, time->tm_min, + time->tm_sec, msec)) + return FALSE; + ret_time->dst = time->tm_isdst ? 1 : 0; #ifdef SILC_WIN32 ret_time->utc_east = _timezone < 0 ? 1 : 0; ret_time->utc_hour = (ret_time->utc_east ? (-(_timezone)) / 3600 : @@ -89,39 +146,6 @@ SilcBool silc_time_value(SilcInt64 timeval, SilcTime ret_time) return TRUE; } -/* Fills the SilcTime structure with correct values */ - -static SilcBool silc_time_fill(SilcTime time, - unsigned int year, - unsigned int month, - unsigned int day, - unsigned int hour, - unsigned int minute, - unsigned int second) -{ - if (year > 8191) - return FALSE; - if (month < 1 || month > 12) - return FALSE; - if (day < 1 || day > 31) - return FALSE; - if (hour > 23) - return FALSE; - if (minute > 60) - return FALSE; - if (second > 61) - return FALSE; - - time->year = year; - time->month = month; - time->day = day; - time->hour = hour; - time->minute = minute; - time->second = second; - - return TRUE; -} - /* Returns time from universal time string into SilcTime */ SilcBool silc_time_universal(const char *universal_time, SilcTime ret_time) @@ -143,7 +167,7 @@ SilcBool silc_time_universal(const char *universal_time, SilcTime ret_time) } /* Fill the SilcTime structure */ - ret = silc_time_fill(ret_time, year, month, day, hour, minute, second); + ret = silc_time_fill(ret_time, year, month, day, hour, minute, second, 0); if (!ret) { SILC_LOG_DEBUG(("Incorrect values in UTC time string")); return FALSE; @@ -180,28 +204,28 @@ SilcBool silc_time_universal(const char *universal_time, SilcTime ret_time) /* Encode universal time string. */ -SilcBool silc_time_universal_string(SilcTime timeval, char *ret_string, - SilcUInt32 ret_string_size) +SilcBool silc_time_universal_string(SilcTime time_val, char *ret_string, + SilcUInt32 ret_string_size) { int ret, len = 0; memset(ret_string, 0, ret_string_size); - ret = snprintf(ret_string, ret_string_size - 1, + ret = silc_silc_snprintf(ret_string, ret_string_size - 1, "%02u%02u%02u%02u%02u%02u", - timeval->year % 100, timeval->month, timeval->day, - timeval->hour, timeval->minute, timeval->second); + time_val->year % 100, time_val->month, time_val->day, + time_val->hour, time_val->minute, time_val->second); if (ret < 0) return FALSE; len += ret; - if (!timeval->utc_hour && !timeval->utc_minute) { - ret = snprintf(ret_string + len, ret_string_size - 1 - len, "Z"); + if (!time_val->utc_hour && !time_val->utc_minute) { + ret = silc_silc_snprintf(ret_string + len, ret_string_size - 1 - len, "Z"); if (ret < 0) return FALSE; len += ret; } else { - ret = snprintf(ret_string + len, ret_string_size - 1 - len, - "%c%02u%02u", timeval->utc_east ? '+' : '-', - timeval->utc_hour, timeval->utc_minute); + ret = silc_silc_snprintf(ret_string + len, ret_string_size - 1 - len, + "%c%02u%02u", time_val->utc_east ? '+' : '-', + time_val->utc_hour, time_val->utc_minute); if (ret < 0) return FALSE; len += ret; @@ -232,7 +256,7 @@ SilcBool silc_time_generalized(const char *generalized_time, SilcTime ret_time) } /* Fill the SilcTime structure */ - ret = silc_time_fill(ret_time, year, month, day, hour, minute, second); + ret = silc_time_fill(ret_time, year, month, day, hour, minute, second, 0); if (!ret) { SILC_LOG_DEBUG(("Incorrect values in generalized time string")); return FALSE; @@ -290,36 +314,36 @@ SilcBool silc_time_generalized(const char *generalized_time, SilcTime ret_time) /* Encode generalized time string */ -SilcBool silc_time_generalized_string(SilcTime timeval, char *ret_string, - SilcUInt32 ret_string_size) +SilcBool silc_time_generalized_string(SilcTime time_val, char *ret_string, + SilcUInt32 ret_string_size) { int len = 0, ret; memset(ret_string, 0, ret_string_size); - ret = snprintf(ret_string, ret_string_size - 1, + ret = silc_silc_snprintf(ret_string, ret_string_size - 1, "%04u%02u%02u%02u%02u%02u", - timeval->year, timeval->month, timeval->day, timeval->hour, - timeval->minute, timeval->second); + time_val->year, time_val->month, time_val->day, time_val->hour, + time_val->minute, time_val->second); if (ret < 0) return FALSE; len += ret; - if (timeval->msecond) { - ret = snprintf(ret_string + len, ret_string_size - 1 - len, - ".%lu", (unsigned long)timeval->msecond); + if (time_val->msecond) { + ret = silc_silc_snprintf(ret_string + len, ret_string_size - 1 - len, + ".%lu", (unsigned long)time_val->msecond); if (ret < 0) return FALSE; len += ret; } - if (!timeval->utc_hour && !timeval->utc_minute) { - ret = snprintf(ret_string + len, ret_string_size - 1 - len, "Z"); + if (!time_val->utc_hour && !time_val->utc_minute) { + ret = silc_silc_snprintf(ret_string + len, ret_string_size - 1 - len, "Z"); if (ret < 0) return FALSE; len += ret; } else { - ret = snprintf(ret_string + len, ret_string_size - 1 - len, - "%c%02u%02u", timeval->utc_east ? '+' : '-', - timeval->utc_hour, timeval->utc_minute); + ret = silc_silc_snprintf(ret_string + len, ret_string_size - 1 - len, + "%c%02u%02u", time_val->utc_east ? '+' : '-', + time_val->utc_hour, time_val->utc_minute); if (ret < 0) return FALSE; len += ret; @@ -327,3 +351,16 @@ SilcBool silc_time_generalized_string(SilcTime timeval, char *ret_string, return TRUE; } + +/* Return TRUE if `smaller' is smaller than `bigger'. */ + +SilcBool silc_compare_timeval(struct timeval *smaller, + struct timeval *bigger) +{ + if ((smaller->tv_sec < bigger->tv_sec) || + ((smaller->tv_sec == bigger->tv_sec) && + (smaller->tv_usec < bigger->tv_usec))) + return TRUE; + + return FALSE; +}