Skip to content

Winevtlog does not include DST in UTC offset #8385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
laurensknoll wants to merge 2 commits into from
Closed

Winevtlog does not include DST in UTC offset #8385

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e501cb5
in_winevtlog: include daylight savings time offset to utc offset
laurensknoll Jan 12, 2024
6580b10
Merge branch 'master' into winevtlog-include-utc-offset
laurensknoll Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 34 additions & 2 deletions plugins/in_winevtlog/pack.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,24 +190,38 @@ static int pack_systemtime(struct winevtlog_config *ctx, SYSTEMTIME *st)
size_t len = 0;
_locale_t locale;
TIME_ZONE_INFORMATION tzi;
DWORD tztype = 0;
SYSTEMTIME st_local;

GetTimeZoneInformation(&tzi);
tztype = GetTimeZoneInformation(&tzi);

locale = _get_current_locale();
if (locale == NULL) {
return -1;
}
if (st != NULL) {
SystemTimeToTzSpecificLocalTime(&tzi, st, &st_local);

struct tm tm = {st_local.wSecond,
st_local.wMinute,
st_local.wHour,
st_local.wDay,
st_local.wMonth-1,
st_local.wYear-1900,
st_local.wDayOfWeek, 0, 0};

switch (tztype) {
case TIME_ZONE_ID_DAYLIGHT:
tm.tm_isdst = 1;
break;
case TIME_ZONE_ID_STANDARD:
tm.tm_isdst = 0;
break;
case TIME_ZONE_ID_UNKNOWN:
default:
tm.tm_isdst = -1;
break;
}

len = _strftime_l(buf, 64, FORMAT_ISO8601, &tm, locale);
if (len == 0) {
flb_errno();
Expand All @@ -233,6 +247,10 @@ static int pack_filetime(struct winevtlog_config *ctx, ULONGLONG filetime)
FILETIME ft, ft_local;
SYSTEMTIME st;
_locale_t locale;
TIME_ZONE_INFORMATION tzi;
DWORD tztype = 0;

tztype = GetTimeZoneInformation(&tzi);

locale = _get_current_locale();
if (locale == NULL) {
Expand All @@ -244,6 +262,20 @@ static int pack_filetime(struct winevtlog_config *ctx, ULONGLONG filetime)
FileTimeToLocalFileTime(&ft, &ft_local);
if (FileTimeToSystemTime(&ft_local, &st)) {
struct tm tm = {st.wSecond, st.wMinute, st.wHour, st.wDay, st.wMonth-1, st.wYear-1900, st.wDayOfWeek, 0, 0};

switch (tztype) {
case TIME_ZONE_ID_DAYLIGHT:
tm.tm_isdst = 1;
break;
case TIME_ZONE_ID_STANDARD:
tm.tm_isdst = 0;
break;
case TIME_ZONE_ID_UNKNOWN:
default:
tm.tm_isdst = -1;
break;
}

len = _strftime_l(buf, 64, FORMAT_ISO8601, &tm, locale);
if (len == 0) {
flb_errno();
Expand Down