Changeset dcd5462 in nscp for modules

Timestamp:

06/22/09 13:23:18 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

4580c6c, cf87b57

Parents:

b39c1f3

Message:

post 0.3.6 build (fixes the CheckDisk errors)

Location:

modules

Files:

• CheckDisk/CheckDisk.cpp (modified) (7 diffs)
• CheckEventLog/CheckEventLog-2005.vcproj (modified) (1 diff)
• CheckEventLog/CheckEventLog.cpp (modified) (5 diffs)
• NRPEListener/NRPEListener.cpp (modified) (1 diff)
• NSCAAgent/NSCAThread.cpp (modified) (1 diff)

modules/CheckDisk/CheckDisk.cpp

@@ -25 +25 @@
 #include <filter_framework.hpp>
 #include <error.hpp>
-
+#include <file_helpers.hpp>
 
 CheckDisk gCheckDisk;
@@ -115 +115 @@
     NSC_DEBUG_MSG_STD(_T("Found a file dont do recursive scan: ") + dir);
     // It is a file check it an return (dont check recursivly)
-    pattern_type single_path = split_path(dir);
+    pattern_type single_path = split_path_ex(dir);
+    NSC_DEBUG_MSG_STD(_T("Path is: ") + single_path.first);
     HANDLE hFind = FindFirstFile(dir.c_str(), &wfd);
     if (hFind != INVALID_HANDLE_VALUE) {
@@ -318 +319 @@
 };
 typedef std::pair<std::wstring,std::wstring> pattern_type;
-pattern_type split_path(std::wstring path) {
+pattern_type split_path_ex(std::wstring path) {
   std::wstring baseDir;
+  if (file_helpers::checks::is_directory(path)) {
+    return pattern_type(path, _T(""));
+  }
   std::wstring::size_type pos = path.find_last_of('\\');
   if (pos == std::wstring::npos) {
@@ -325 +329 @@
   }
   NSC_DEBUG_MSG_STD(_T("Looking for: path: ") + path.substr(0, pos) + _T(", pattern: ") + path.substr(pos+1));
+  return pattern_type(path.substr(0, pos), path.substr(pos+1));
+}
+
+typedef std::pair<std::wstring,std::wstring> pattern_type;
+pattern_type split_pattern(std::wstring path) {
+  std::wstring baseDir;
+  if (file_helpers::checks::exists(path)) {
+    return pattern_type(path, _T(""));
+  }
+  std::wstring::size_type pos = path.find_last_of('\\');
+  if (pos == std::wstring::npos) {
+    pattern_type(path, _T("*.*"));
+  }
+  NSC_DEBUG_MSG_STD(_T("Looking for: pattern: ") + path.substr(0, pos) + _T(", pattern: ") + path.substr(pos+1));
   return pattern_type(path.substr(0, pos), path.substr(pos+1));
 }
@@ -365 +383 @@
     get_size sizeFinder;
     NSC_error errors;
-    pattern_type splitpath = split_path(path.data);
+    pattern_type splitpath = split_pattern(path.data);
     recursive_scan<get_size>(splitpath.first, splitpath.second, -1, -1, sizeFinder, &errors);
     if (sizeFinder.hasError()) {
@@ -653 +671 @@
 
   NSC_error errors;
-  pattern_type splitpath = split_path(path);
+  pattern_type splitpath = split_pattern(path);
   recursive_scan<find_first_file_info>(splitpath.first, splitpath.second, -1, -1, finder, &errors);
   if (finder.hasError()) {
@@ -717 +735 @@
   NSC_error errors;
   for (std::list<std::wstring>::const_iterator pit = paths.begin(); pit != paths.end(); ++pit) {
-    pattern_type path = split_path(*pit);
+    pattern_type path = split_pattern(*pit);
     recursive_scan<file_filter_function>(path.first, path.second, 0, max_dir_depth, finder, &errors);
     if (finder.hasError()) {

modules/CheckEventLog/CheckEventLog-2005.vcproj

@@ -613 +613 @@
         Name="VCCLCompilerTool"
         AdditionalIncludeDirectories="../include;../../include"
-        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;USE_BOOST"
+        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;"
         UsePrecompiledHeader="2"
         WarningLevel="3"

modules/CheckEventLog/CheckEventLog.cpp

@@ -29 +29 @@
 #include <error.hpp>
 #include <map>
+#include <vector>
 
 CheckEventLog gCheckEventLog;
@@ -315 +316 @@
 
   std::wstring render_message() {
-    DWORD *dwArgs = new DWORD[pevlr_->NumStrings+1];
+    std::vector<std::wstring> args;
+    TCHAR* *pArgs = new TCHAR*[pevlr_->NumStrings+1];
     TCHAR* p = reinterpret_cast<TCHAR*>(reinterpret_cast<LPBYTE>(pevlr_) + pevlr_->StringOffset);
     for (unsigned int i =0;i<pevlr_->NumStrings;i++) {
-      dwArgs[i] = reinterpret_cast<DWORD>(p);
+      args.push_back(p);
+      pArgs[i] = p;
       DWORD len = wcslen(p);
-      p += len+1;
-    }
-
-/*
-    TCHAR **_sz = (TCHAR**)GlobalAlloc(GPTR, (pevlr_->NumStrings)*sizeof(TCHAR *));
-    register UINT z;
-    TCHAR* p = reinterpret_cast<TCHAR*>(reinterpret_cast<LPBYTE>(pevlr_) + pevlr_->StringOffset);
-    for(unsigned int z = 0; z < pevlr_->NumStrings; z++) {
-      DWORD len = wcslen(p);
-      _sz[z] = (TCHAR *)GlobalAlloc(GPTR, (len+1) * sizeof(TCHAR));
-      wcscpy_s(_sz[z], len, p);
-      p += len+1;
-    }
-*/
+      p = &(p[len+1]);
+      //p += len+1;
+    }
+
     std::wstring ret;
     strEx::splitList dlls = strEx::splitEx(get_dll(), _T(";"));
     for (strEx::splitList::const_iterator cit = dlls.begin(); cit != dlls.end(); ++cit) {
       //std::wstring msg = error::format::message::from_module((*cit), eventID(), _sz);
-      std::wstring msg = error::format::message::from_module((*cit), eventID(), dwArgs);
-      if (msg.empty()) {
-        msg = error::format::message::from_module((*cit), pevlr_->EventID, dwArgs);
+      std::wstring msg;
+      try {
+        msg = error::format::message::from_module_x64((*cit), eventID(), pArgs, pevlr_->NumStrings);
+        if (msg.empty()) {
+          msg = error::format::message::from_module_x64((*cit), pevlr_->EventID, pArgs, pevlr_->NumStrings);
+        }
+      } catch (...) {
+        msg = _T("Unknown exception getting message");
       }
       strEx::replace(msg, _T("\n"), _T(" "));
@@ -354 +352 @@
       }
     }
-    delete [] dwArgs;
+    delete [] pArgs;
     return ret;
   }
@@ -597 +595 @@
     return NSCAPI::returnUNKNOWN;
   }
+  bool buffer_error_reported = false;
 
   for (std::list<std::wstring>::const_iterator cit2 = files.begin(); cit2 != files.end(); ++cit2) {
@@ -628 +627 @@
         DWORD err = GetLastError();
         if (err == ERROR_INSUFFICIENT_BUFFER) {
-          NSC_LOG_ERROR_STD(_T("EvenlogBuffer is too small change the value of ") + EVENTLOG_BUFFER + _T("=") + strEx::itos(dwNeeded+1) + _T(" under [EventLog] in nsc.ini : ") + error::lookup::last_error(err));
+          if (!buffer_error_reported) {
+            NSC_LOG_ERROR_STD(_T("EvenlogBuffer is too small change the value of ") + EVENTLOG_BUFFER + _T("=") + strEx::itos(dwNeeded+1) + _T(" under [EventLog] in nsc.ini : ") + error::lookup::last_error(err));
+            buffer_error_reported = true;
+          }
         } else if (err == ERROR_HANDLE_EOF) {
           break;

modules/NRPEListener/NRPEListener.cpp

@@ -324 +324 @@
       } catch (NRPEPacket::NRPEPacketException e) {
         NSC_LOG_ERROR_STD(_T("NRPESocketException: ") + e.getMessage());
-        NRPEPacket err(NRPEPacket::responsePacket, NRPEPacket::version2, NSCAPI::returnUNKNOWN, _T("Could not construct return paket in NRPE handler check clientside (nsclient.log) logs..."), buffer_length_);
         try {
-          block.copyFrom(out.getBuffer(), out.getBufferLength());
+          NRPEPacket err(NRPEPacket::responsePacket, NRPEPacket::version2, NSCAPI::returnUNKNOWN, _T("Could not construct return paket in NRPE handler check clientside (nsclient.log) logs..."), buffer_length_);
+          block.copyFrom(err.getBuffer(), err.getBufferLength());
         } catch (NRPEPacket::NRPEPacketException e) {
           NSC_LOG_ERROR_STD(_T("NRPESocketException (again): ") + e.getMessage());

modules/NSCAAgent/NSCAThread.cpp

@@ -74 +74 @@
   else
     timeDelta_ = strEx::stoui_as_time(tmpstr);
+  timeDelta_ = timeDelta_ / 1000;
   NSC_DEBUG_MSG_STD(_T("Time difference for NSCA server is: ") + strEx::itos(timeDelta_));
   checkIntervall_ = NSCModuleHelper::getSettingsInt(NSCA_AGENT_SECTION_TITLE, NSCA_INTERVAL, NSCA_INTERVAL_DEFAULT);