RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-17 05:32:45 +01:00
Code Releases Activity

native/rtc: ensure no struct tm extra information is used

Browse Source
This commit is contained in:
Karl Fessel 2021-04-01 15:21:17 +02:00
parent 9e7f1d0097
commit 15f2d0008a
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
cpu/native/periph/rtc.c
View File

@ -53,6 +53,19 @@ static void _native_rtc_cb(void *arg) {
_native_rtc_alarm_callback = NULL;
}
/* RIOT does not expect DST or TZ information */
static void _remove_struct_tm_extra( struct tm * t ){
struct tm tmp = {.tm_year = t->tm_year,
.tm_mon = t->tm_mon,
.tm_mday = t->tm_mday,
.tm_hour = t->tm_hour,
.tm_min = t->tm_min,
.tm_sec = t->tm_sec,
.tm_wday = t->tm_wday
};
*t = tmp;
}
void rtc_init(void)
{
DEBUG("rtc_init\n");
@ -115,8 +128,14 @@ int rtc_set_time(struct tm *ttime)
warnx("rtc_set_time: not powered on");
return -1;
}
/* ensure there is no accidental extra information */
struct tm itime = *ttime;
_remove_struct_tm_extra(&itime);
/* mktime() and localtime are only inverse functions if tm_isdst == -1 */
itime.tm_isdst = -1;
time_t tnew = mktime(&itime);
time_t tnew = mktime(ttime);
if (tnew == -1) {
warnx("rtc_set_time: out of time_t range");
return -1;
@ -154,8 +173,8 @@ int rtc_get_time(struct tm *ttime)
}
_native_syscall_leave();
/* riot does not handle dst */
ttime->tm_isdst=0;
/* RIOT does not handle DST or TZ information */
_remove_struct_tm_extra(ttime);
return 0;
}
@ -174,7 +193,13 @@ int rtc_set_alarm(struct tm *time, rtc_alarm_cb_t cb, void *arg)
struct tm now;
rtc_get_time(&now);
time_t tdiff_secs = mktime(time) - mktime(&now);
/* ensure there is no accidental extra information */
struct tm intime = *time;
_remove_struct_tm_extra(&intime);
/* tm_idst are ignored for these mktime calls since
* both times carry the same (00) timezone information */
time_t tdiff_secs = mktime(&intime) - mktime(&now);
if (_native_rtc_alarm_callback) {
xtimer_remove(&_native_rtc_timer);