Changeset f22f5a9 in nscp for trunk/modules/CheckSystem/CheckSystem.cpp

Timestamp:

04/28/05 20:17:32 (8 years ago)

Author:

Michael Medin <michael@…>

Children:

7b04f88

Parents:

ae192e3

Message:

• Fixed multitasking socket listsner (had a hard-to-find memory leak)
• Changed ProcessEnumeration? class to one that should work on NT4 New option to set this in the config file. + Added some more options to the config file.

File:

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

trunk/modules/CheckSystem/CheckSystem.cpp

@@ -7 +7 @@
 #include <tlhelp32.h>
 #include <EnumNtSrv.h>
+#include <EnumProcess.h>
 
 CheckSystem gNSClientCompat;
@@ -27 +28 @@
  * @return 
  */
-CheckSystem::CheckSystem() {}
+CheckSystem::CheckSystem() : processMethod_(0) {}
 /**
  * Default d-tor
@@ -40 +41 @@
 bool CheckSystem::loadModule() {
   pdhThread.createThread();
+
+  std::string wantedMethod = NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_ENUMPROC_METHOD, C_SYSTEM_ENUMPROC_METHOD_DEFAULT);
+
+  CEnumProcess tmp;
+  int method = tmp.GetAvailableMethods();
+
+  if (wantedMethod == C_SYSTEM_ENUMPROC_METHOD_PSAPI) {
+    if (method == (method|ENUM_METHOD::PSAPI)) {
+      processMethod_ = ENUM_METHOD::PSAPI;
+    } else {
+      NSC_LOG_ERROR_STD("PSAPI method not avalible, check " C_SYSTEM_ENUMPROC_METHOD " option.");
+    }
+  } else {
+    if (method == (method|ENUM_METHOD::TOOLHELP)) {
+      processMethod_ = ENUM_METHOD::TOOLHELP;
+    } else {
+      NSC_LOG_ERROR_STD("TOOLHELP method not avalible, check " C_SYSTEM_ENUMPROC_METHOD " option.");
+    }
+  }
   return true;
 }
@@ -109 +129 @@
     return checkCounter(command, argLen, char_args, msg, perf);
   }
-/*
-    case REQ_PROCSTATE:
-      rb = NSCommands::procState(arrayBuffer::arrayBuffer2list(argLen, char_args));
-      msg = rb.msg_;
-      perf = rb.perf_;
-      return rb.code_;
-  */
   return NSCAPI::returnIgnored;
 }
@@ -390 +403 @@
 * @return a hash_map with all running processes
 */
-NSPROCLST GetProcessList(void)
-{
-  HANDLE hProcessSnap;
-  PROCESSENTRY32 pe32;
+NSPROCLST GetProcessList(int processMethod)
+{
   NSPROCLST ret;
-
-  // Take a snapshot of all processes in the system.
-  hProcessSnap = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
-  if( hProcessSnap == INVALID_HANDLE_VALUE )
-    throw "CreateToolhelp32Snapshot (of processes) failed";
-
-  // Set the size of the structure before using it.
-  pe32.dwSize = sizeof( PROCESSENTRY32 );
-
-  // Retrieve information about the first process,
-  // and exit if unsuccessful
-  if( !Process32First( hProcessSnap, &pe32 ) ) {
-    CloseHandle( hProcessSnap );     // Must clean up the snapshot object!
-    throw "Process32First failed!";
-  }
-
-  // Now walk the snapshot of processes, and
-  // display information about each process in turn
-  do {
-    ret[pe32.szExeFile] = pe32.th32ProcessID;
-  } while( Process32Next( hProcessSnap, &pe32 ) );
-
-  // Don't forget to clean up the snapshot object!
-  CloseHandle( hProcessSnap );
+  if (processMethod == 0) {
+    NSC_LOG_ERROR_STD("ProcessMethod not defined or not available.");
+    return ret;
+  }
+  CEnumProcess enumeration;
+  enumeration.SetMethod(processMethod);
+  CEnumProcess::CProcessEntry entry;
+  for (BOOL OK = enumeration.GetProcessFirst(&entry); OK; OK = enumeration.GetProcessNext(&entry) ) {
+    ret[entry.lpFilename] = entry.dwPID;
+  }
   return ret;
 }
@@ -452 +449 @@
   NSPROCLST runningProcs;
   try {
-    runningProcs = GetProcessList();
+    runningProcs = GetProcessList(processMethod_);
   } catch (char *c) {
     NSC_LOG_ERROR_STD("ERROR: " + c);