Module: check_mk Branch: master Commit: a525fb334c68f189ada0638781fdeea631d2089b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a525fb334c68f1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 4 16:42:57 2014 +0100 #1431 FIX windows_agent: fixed error on parsing unicode formatted logfiles If the unicode logfile grew more than 8kB since the last query there was a chance that the last logline of this 8kB Block got cut in half and only the last part was reported. --- .werks/1431 | 12 ++++++++++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 208896 -> 208896 bytes agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 178176 -> 178176 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 178176 -> 178176 bytes agents/windows/install_agent-64.exe | Bin 160295 -> 160296 bytes agents/windows/install_agent.exe | Bin 157234 -> 157225 bytes 10 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.werks/1431 b/.werks/1431 new file mode 100644 index 0000000..efd1a27 --- /dev/null +++ b/.werks/1431 @@ -0,0 +1,12 @@ +Title: windows_agent: fixed error on parsing unicode formatted logfiles +Level: 1 +Component: core +Compatible: compat +Version: 1.2.5i7 +Date: 1415115591 +Class: fix + +If the unicode logfile grew more than 8kB since the last query there was a +chance that the last logline of this 8kB Block got cut in half and only +the last part was reported. + diff --git a/ChangeLog b/ChangeLog index 13f68ef..8cd1dad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.5i7: Core & Setup: * 1483 FIX: Savely replace illegal vertical bars in check plugin output... + * 1431 FIX: windows_agent: fixed error on parsing unicode formatted logfiles... Checks & Agents: * 1197 climaveneta_temp: New check for temperature sensors on Climaveneta clima devices diff --git a/agents/windows/build_version b/agents/windows/build_version index 6529ff8..29d6383 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -98 +100 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index fe6c789..94d70b2 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 04010e3..9bd5916 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index fa711e4..33b9d89 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2122,7 +2122,7 @@ void cleanup_logwatch() #define UNICODE_BUFFER_SIZE 8192 int fill_unicode_bytebuffer(FILE *file, char* buffer, int offset) { int bytes_to_read = UNICODE_BUFFER_SIZE - offset; - int read_bytes = fread(buffer, 1, bytes_to_read, file); + int read_bytes = fread(buffer + offset, 1, bytes_to_read, file); return read_bytes + offset; } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index faafe28..249ae5d 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 1705833..f7106bc 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 7cbbcea..92e0de1 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 6be4b19..d73ad04 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ