Changeset 3527e99 in nscp for trunk/modules/CheckSystem/CheckSystem.cpp

Timestamp:

11/28/07 20:33:21 (5 years ago)

Author:

Michael Medin <michael@…>

Children:

42edcda

Parents:

5ee4e31

Message:

2007-11-28 MickeM

• Fixed some UNICODE issues with process-listings + Added an error message if the "detected" process enumeration method is not available. + Fixed some more unicode issues Password encrypt/decrypt: #107
• Fixed unicode issues with "external programs" #109
• Fixed so default string for check_nt:s FILEAGE command is "delta" is 5 minutes ago (and not absolute ie. 1970...), Issue #39 + added support for <date strings> to check_nt:s FILEAGE command, Issue #39

append: .<date string> if you want to use a "custom date" like so: ... -v FILEAGE -l c:
windows,Date: %Y-%m-%d %H:%M:%S" -w 5 -c 6 ...
Only the above listed %<char> works, and default to 0 so might not be to pretty but works...

File:

• trunk/modules/CheckSystem/CheckSystem.cpp (modified) (4 diffs)

trunk/modules/CheckSystem/CheckSystem.cpp

@@ -70 +70 @@
     if (systemInfo::isBelowNT4(osVer)) {
       NSC_DEBUG_MSG_STD(_T("Autodetected NT4<, using PSAPI process enumeration."));
-      processMethod_ = ENUM_METHOD::PSAPI;
+      if (method == (method|ENUM_METHOD::PSAPI)) {
+        processMethod_ = ENUM_METHOD::PSAPI;
+      } else {
+        NSC_LOG_ERROR_STD(_T("PSAPI method not available, since you are on NT4 you need to install \"Platform SDK Redistributable: PSAPI for Windows NT\" from Microsoft."));
+        NSC_LOG_ERROR_STD(_T("Try this URL: http://www.microsoft.com/downloads/details.aspx?FamilyID=3d1fbaed-d122-45cf-9d46-1cae384097ac"));
+      }
     } else if (systemInfo::isAboveW2K(osVer)) {
       NSC_DEBUG_MSG_STD(_T("Autodetected W2K>, using TOOLHELP process enumeration."));
-      processMethod_ = ENUM_METHOD::TOOLHELP;
+      if (method == (method|ENUM_METHOD::TOOLHELP)) {
+        processMethod_ = ENUM_METHOD::TOOLHELP;
+      } else {
+        NSC_LOG_ERROR_STD(_T("TOOLHELP was not available, since you are on > W2K you need top manually override the ") C_SYSTEM_ENUMPROC_METHOD _T("option in NSC:ini."));
+      }
     } else {
       NSC_DEBUG_MSG_STD(_T("Autodetected failed, using PSAPI process enumeration."));
       processMethod_ = ENUM_METHOD::PSAPI;
+      if (method == (method|ENUM_METHOD::PSAPI)) {
+        processMethod_ = ENUM_METHOD::PSAPI;
+      } else {
+        NSC_LOG_ERROR_STD(_T("PSAPI method not availabletry installing \"Platform SDK Redistributable: PSAPI for Windows NT\" from Microsoft."));
+        NSC_LOG_ERROR_STD(_T("Try this URL: http://www.microsoft.com/downloads/details.aspx?FamilyID=3d1fbaed-d122-45cf-9d46-1cae384097ac"));
+      }
     }
   } else if (wantedMethod == C_SYSTEM_ENUMPROC_METHOD_PSAPI) {
@@ -721 +736 @@
   }
   CEnumProcess enumeration;
-  enumeration.SetMethod(processMethod);
+  if (enumeration.SetMethod(processMethod) != processMethod) {
+    NSC_LOG_ERROR_STD(_T("Failed to set process enumeration method"));
+    return ret;
+  }
   CEnumProcess::CProcessEntry entry;
   for (BOOL OK = enumeration.GetProcessFirst(&entry); OK; OK = enumeration.GetProcessNext(&entry) ) {
@@ -797 +815 @@
   for (std::list<StateConatiner>::iterator it = list.begin(); it != list.end(); ++it) {
     NSPROCLST::iterator proc = runningProcs.find((*it).data);
-    bool bFound = proc != runningProcs.end();
+    bool bFound = (proc != runningProcs.end());
     std::wstring tmp;
     TNtServiceInfo info;
@@ -904 +922 @@
       pdh.close();
       double value = cDouble.getValue();
-      //std::wcout << "Collected double data: " << value << std::endl;
       if (bNSClient) {
         msg += strEx::itos(static_cast<float>(value));