Changeset c1d545e in nscp

Timestamp:

02/09/08 11:36:31 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

1a35b3f

Parents:

047516e

Message:

2008-02-09 MickeM

+ New module CheckExternalScripts to handle 1, external script (similar to the old NRPE but in its own module)

• Can Check batch/vbs/programs/*
• Works with NSCA module (if you don't want to have NRPE at the same time)
• Simpler syntax (discarded old and added new section for alias)
• Started to add "sample alias" to ease initial setup and give some nice ideas (please provide me with feedback on them)

Files:

• AutoBuild.h (modified) (1 diff)
• NSC.dist (modified) (1 diff)
• NSCPlugin.cpp (modified) (11 diffs)
• NSClient++-2005.sln (modified) (2 diffs)
• NSClient++.cpp (modified) (1 diff)
• changelog (modified) (5 diffs)
• include/Mutex.h (modified) (3 diffs)
• include/NSCHelper.cpp (modified) (2 diffs)
• include/NSCHelper.h (modified) (1 diff)
• include/config.h (modified) (1 diff)
• include/thread.h (modified) (8 diffs)
• modules/CheckExternalScripts/CheckExternalScripts-2005.vcproj (added)
• modules/CheckExternalScripts/CheckExternalScripts-2008.vcproj (added)
• modules/CheckExternalScripts/CheckExternalScripts.cpp (added)
• modules/CheckExternalScripts/CheckExternalScripts.def (added)
• modules/CheckExternalScripts/CheckExternalScripts.h (added)
• modules/CheckExternalScripts/stdafx.cpp (added)
• modules/CheckExternalScripts/stdafx.h (added)
• modules/CheckSystem/PDHCollector.cpp (modified) (1 diff)
• modules/SysTray/SysTray.aps (modified) (previous)

AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,0,39
-#define PRODUCTVER     0,3,0,39
-#define STRFILEVER     _T("0.3.0.39")
-#define STRPRODUCTVER  _T("0.3.0.39")
-#define STRPRODUCTDATE  _T("2008-02-03")
+#define FILEVER        0,3,0,48
+#define PRODUCTVER     0,3,0,48
+#define STRFILEVER     _T("0.3.0.48")
+#define STRPRODUCTVER  _T("0.3.0.48")
+#define STRPRODUCTDATE  _T("2008-02-08")
 #endif // AUTOBUILD_H

NSC.dist

@@ -103 +103 @@
 ;check_all_services[SERVICE_DEMAND_START]=ignored
 ;check_all_services[SERVICE_DISABLED]=stopped
+
+[External Script]
+;# COMMAND TIMEOUT
+;  This specifies the maximum number of seconds that the NRPE daemon will allow plug-ins to finish executing before killing them off.
+;command_timeout=60
+;
+;# COMMAND ARGUMENT PROCESSING
+;  This option determines whether or not the NRPE daemon will allow clients to specify arguments to commands that are executed.
+;allow_arguments=0
+;
+;# COMMAND ALLOW NASTY META CHARS
+;  This option determines whether or not the NRPE daemon will allow clients to specify nasty (as in |`&><'"\[]{}) characters in arguments.
+;allow_nasty_meta_chars=0
+;
+;# COMMAND ALLOW NASTY META CHARS
+;  This option determines whether or not the NRPE daemon will allow clients to specify nasty (as in |`&><'"\[]{}) characters in arguments.
+;script_dir=c:\my\script\dir
+
+[External Scripts]
+;check_es_long=scripts\long.bat
+;check_es_ok=scripts\ok.bat
+;check_es_nok=scripts\nok.bat
+;check_vbs_sample=cscript.exe //T:30 //NoLogo scripts\check_vb.vbs
+
+[External Alias]
+alias_cpu=checkCPU warn=80 crit=90 time=5m time=1m time=30s
+alias_disk=CheckDriveSize MinWarn=10% MinCrit=5% CheckAll FilterType=FIXED
+alias_service=checkServiceState CheckAll
+alias_mem=checkMem MaxWarn=80% MaxCrit=90% ShowAll type=physical
 
 

NSCPlugin.cpp

@@ -147 +147 @@
     return fGetVersion(major, minor, revision)?true:false;
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in getVersion in: ": ) + file_);
+    throw NSPluginException(file_, _T("Unhandled exception in getVersion."));
   }
 }
@@ -163 +163 @@
     return false;
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in hasCommandHandler in: ": ) + file_);
+    throw NSPluginException(file_, _T("Unhandled exception in hasCommandHandler."));
   }
 }
@@ -179 +179 @@
     return false;
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in hasMessageHandler in: ": ) + file_);
+    throw NSPluginException(file_, _T("Unhandled exception in hasMessageHandler."));
   }
 }
@@ -203 +203 @@
     return fHandleCommand(command, argLen, arguments, returnMessageBuffer, returnMessageBufferLen, returnPerfBuffer, returnPerfBufferLen);
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in handleCommand in: ": ) + file_);
+    throw NSPluginException(file_, _T("Unhandled exception in handleCommand."));
   }
 }
@@ -221 +221 @@
     fHandleMessage(msgType, file, line, message);
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in handleMessage in: ": ) + file_);
+    throw NSPluginException(file_, _T("Unhandled exception in handleMessage."));
   }
 }
@@ -236 +236 @@
     fUnLoadModule();
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in handleMessage in: ": ) + file_);
+    throw NSPluginException(file_, _T("Unhandled exception in handleMessage."));
   }
   FreeLibrary(hModule_);
@@ -248 +248 @@
     return fGetName(buf, buflen)?true:false;
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in getName in: ": ) + file_);
+    throw NSPluginException(file_, _T("Unhandled exception in getName."));
   }
 }
@@ -257 +257 @@
     return fGetDescription(buf, buflen)?true:false;
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in getDescription in: ": ) + file_);
+    throw NSPluginException(file_, _T("Unhandled exception in getDescription."));
   }
 }
@@ -279 +279 @@
     fModuleHelperInit(NSAPILoader);
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in getDescription in: ": ) + file_);
+    throw NSPluginException(file_, _T("Unhandled exception in getDescription."));
   }
   
@@ -335 +335 @@
     return fGetConfigurationMeta(buflen, buf)?true:false;
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in getConfigurationMeta in: ": ) + file_);
+    throw NSPluginException(file_, _T("Unhandled exception in getConfigurationMeta."));
   }
 }
@@ -345 +345 @@
     return fCommandLineExec(command, argLen, arguments);
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in commandLineExec in: ": ) + file_);
-  }
-}
+    throw NSPluginException(file_, _T("Unhandled exception in commandLineExec."));
+  }
+}

NSClient++-2005.sln

@@ -45 +45 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LUA", "..\..\LUA\LUA\LUA.vcproj", "{B6D08289-B8AE-4391-9D07-93B22618BE58}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckExternalScripts", "modules\CheckExternalScripts\CheckExternalScripts-2005.vcproj", "{0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}"
 EndProject
 Global
@@ -638 +640 @@
     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|Win32.Build.0 = Release|Win32
     {B6D08289-B8AE-4391-9D07-93B22618BE58}.Release|x64.ActiveCfg = Release|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Any CPU.ActiveCfg = Debug|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Itanium.ActiveCfg = Debug|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Mixed Platforms.Build.0 = Debug|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Win32.ActiveCfg = Debug|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Win32.Build.0 = Debug|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|x64.ActiveCfg = Debug|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|x64.Build.0 = Debug|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Itanium.ActiveCfg = Debug-MemCheck|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Itanium.ActiveCfg = Distribution|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|Win32.Build.0 = Distribution|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|x64.ActiveCfg = Distribution|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Distribution|x64.Build.0 = Distribution|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Any CPU.ActiveCfg = Nightly|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Itanium.ActiveCfg = Nightly|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Mixed Platforms.Build.0 = Nightly|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Win32.ActiveCfg = Nightly|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|Win32.Build.0 = Nightly|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|x64.ActiveCfg = Nightly|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Nightly|x64.Build.0 = Nightly|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Any CPU.ActiveCfg = Release|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Itanium.ActiveCfg = Release|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Mixed Platforms.ActiveCfg = Release|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Mixed Platforms.Build.0 = Release|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Win32.ActiveCfg = Release|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|Win32.Build.0 = Release|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|x64.ActiveCfg = Release|x64
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Release|x64.Build.0 = Release|x64
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

NSClient++.cpp

@@ -242 +242 @@
   try {
     mainClient.unloadPlugins();
-  } catch(NSPluginException *e) {
-    std::wcout << _T("Exception raised: ") << e->error_ << _T(" in module: ") << e->file_ << std::endl;;
+  } catch(NSPluginException &e) {
+    std::wcout << _T("Exception raised: ") << e.error_ << _T(" in module: ") << e.file_ << std::endl;;
   }
   try {

changelog

@@ -6 +6 @@
  * Add API for rehashing the daemon (or implement it the API is there but does nothing)
 
+2008-02-09 MickeM
+ + New module CheckExternalScripts to handle 1, external script (similar to the old NRPE but in its own module)
+   - Can Check batch/vbs/programs/*
+   - Works with NSCA module (if you don't want to have NRPE at the same time)
+   - Simpler syntax (discarded old and added new section for alias)
+   - Started to add "sample alias" to ease initial setup and give some nice ideas (please provide me with feedback on them)
+
 2008-02-08 MickeM
  + Added some more default catch handlers (on the "core" side of plugin-calls).
@@ -20 +27 @@
 
 2008-02-03 MickeM
- + Added encryption subsystem to NSCA module (still no mcrypt support, but atleast you have "xor" and passwords)
+ + Added encryption subsystem to NSCA module (still no mcrypt support, but at least you have "xor" and passwords)
  + Added API for scripts to register commands
  + Added command descriptions (for some modules)
  * Fixed issue in NRPE that displayed a console window when running commands
  * New improved "inject" dialog from the system tray
-   Lists avalible commands, and shows command descriptions and a lot of other improvments.
- + Added an internal log windows that displays log in realtime.
+   Lists available commands, and shows command descriptions and a lot of other improvements.
+ + Added an internal log windows that displays log in real-time.
  + Fixed some issues with the dialog procs (should work smoother now, especially Termination)
 
 2008-02-02 MickeM
  * Might have fixed the "missing eventlog messages" problem.
- + Added %count% parameter to syntax which (when used with unique) will display the numbe of hits for each message displayed.
+ + Added %count% parameter to syntax which (when used with unique) will display the number of hits for each message displayed.
 
 2008-01-27 MickeM
  * Fixed a memory-leak in format_time
  * Fixed so time/date is displayed in "local time" (not UTC) for the eventlog check
- + Added %message% to evenlog check. Will display the "proper formated eventlog message" as in the eventlog viewer.
+ + Added %message% to eventlog check. Will display the "proper formated eventlog message" as in the eventlog viewer.
    For this to work you need to have the descriptions flag set
    In short: /nrpe -H 192.168.0.147 -c checkEventLog -a truncate=1024 "syntax=%generated%: %message%" descriptions=true file=System MaxWarn=1 MaxCrit=1 filter+eventType==error filter+generated=\<12h filter=new filter=all filter=in
@@ -50 +57 @@
 
 2007-12-10 MickeM
- + Added intial draft for LUA module
+ + Added initial draft for LUA module
 
 2007-12-09 MickeM
@@ -56 +63 @@
  + Improved the socket thread with:
     * a default-catch
-    * If the socket failes to start we still wait for it to shut down (no error message)
+    * If the socket fails to start we still wait for it to shut down (no error message)
  + Added first version of the NSCA agent (NSCAgent.dll)
    (no encryption support as of yet, but will come)
@@ -73 +80 @@
  * 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 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

include/Mutex.h

@@ -23 +23 @@
 #include "Singleton.h"
 #include "strEx.h"
-#include <assert.h>
 #include <windows.h>
 #include <iostream>
@@ -62 +61 @@
     if ( GetLastError() == ERROR_ALREADY_EXISTS )
       hMutex = OpenMutex(MUTEX_ALL_ACCESS, FALSE, NULL);
-    assert(hMutex != NULL);
+    std::wcout << _T("Error in mutex creation: ") << GetLastError() << std::endl;
   }
   /**
@@ -123 +122 @@
    */
   MutexLock(HANDLE hMutex, DWORD timeout = 5000L) : bHasMutex(false), hMutex_(hMutex) {
-    if (hMutex_ == NULL)
-      std::wcout << "Whops..." << std::endl;
-    assert(hMutex_ != NULL);
+    if (hMutex_ == NULL) {
+      std::wcout << _T("Error in mutex lock: ") << std::endl;
+      bHasMutex = false;
+      return;
+    }
     dwWaitResult = WaitForSingleObject(hMutex_, timeout);
     switch (dwWaitResult) {

include/NSCHelper.cpp

@@ -268 +268 @@
  * @return The result of the command
  */
-NSCAPI::nagiosReturn NSCModuleHelper::InjectSplitAndCommand(const std::wstring command, const std::wstring buffer, TCHAR splitChar, std::wstring & message, std::wstring & perf)
+NSCAPI::nagiosReturn NSCModuleHelper::InjectSplitAndCommand(const std::wstring command, const std::wstring buffer, TCHAR splitChar, std::wstring & message, std::wstring & perf, bool escape)
 {
   if (!fNSAPIInject)
@@ -277 +277 @@
     aBuffer= arrayBuffer::createEmptyArrayBuffer(argLen);
   else
-    aBuffer= arrayBuffer::split2arrayBuffer(buffer, splitChar, argLen);
+    aBuffer= arrayBuffer::split2arrayBuffer(buffer, splitChar, argLen, escape);
   NSCAPI::nagiosReturn ret = InjectCommand(command.c_str(), argLen, aBuffer, message, perf);
   arrayBuffer::destroyArrayBuffer(aBuffer, argLen);

include/NSCHelper.h

@@ -134 +134 @@
   NSCAPI::nagiosReturn InjectCommand(const TCHAR* command, const unsigned int argLen, TCHAR **argument, std::wstring & message, std::wstring & perf);
   NSCAPI::nagiosReturn InjectSplitAndCommand(const TCHAR* command, TCHAR* buffer, TCHAR splitChar, std::wstring & message, std::wstring & perf);
-  NSCAPI::nagiosReturn InjectSplitAndCommand(const std::wstring command, const std::wstring buffer, TCHAR splitChar, std::wstring & message, std::wstring & perf);
+  NSCAPI::nagiosReturn InjectSplitAndCommand(const std::wstring command, const std::wstring buffer, TCHAR splitChar, std::wstring & message, std::wstring & perf, bool escape = false);
   void StopService(void);
   std::wstring getBasePath();

include/config.h

@@ -105 +105 @@
 #define NRPE_SETTINGS_SCRIPTDIR_DEFAULT _T("")
 
+// External Script Settings headlines
+#define EXTSCRIPT_SECTION_TITLE _T("External Script")
+#define EXTSCRIPT_SCRIPT_SECTION_TITLE _T("External Scripts")
+#define EXTSCRIPT_ALIAS_SECTION_TITLE _T("External Alias")
+#define EXTSCRIPT_SETTINGS_TIMEOUT _T("command_timeout")
+#define EXTSCRIPT_SETTINGS_TIMEOUT_DEFAULT 60
+#define EXTSCRIPT_SETTINGS_ALLOW_ARGUMENTS _T("allow_arguments")
+#define EXTSCRIPT_SETTINGS_ALLOW_ARGUMENTS_DEFAULT 0
+#define EXTSCRIPT_SETTINGS_ALLOW_NASTY_META _T("allow_nasty_meta_chars")
+#define EXTSCRIPT_SETTINGS_ALLOW_NASTY_META_DEFAULT 0
+#define EXTSCRIPT_SETTINGS_SCRIPTDIR _T("script_dir")
+#define EXTSCRIPT_SETTINGS_SCRIPTDIR_DEFAULT _T("")
+
 // Check System Settings
 #define C_SYSTEM_SECTION_TITLE _T("Check System")

include/thread.h

@@ -68 +68 @@
   bool bThreadHasBeenClosed;
 
-
+#define THREAD_MAGIC_ID 123456
 
   typedef struct thread_param {
@@ -74 +74 @@
     LPVOID lpParam;   // The optional argument to the thread
     Thread *pCore;
+    unsigned int magic_id;
   } thread_param;
 
@@ -83 +84 @@
   Thread(std::wstring threadid) : threadid_(threadid), hThread_(NULL), pObject_(NULL), uThreadID(-1), bThreadHasTerminated(false), bThreadHasBeenClosed(false) {
     hMutex_ = CreateMutex(NULL, FALSE, NULL);
-    assert(hMutex_ != NULL);
+    if (hMutex_ == NULL) {
+      std::wcerr << _T("Failed to create thread mutec for thread: ") << threadid << _T(": ") << GetLastError() << std::endl;
+    }
   }
   /**
@@ -125 +128 @@
   static unsigned __stdcall threadProc(void* lpParameter) {
     thread_param* param = static_cast<thread_param*>(lpParameter);
+    if (param->magic_id != THREAD_MAGIC_ID) {
+      std::wcerr << _T("Thread magic ID check failed :(") << std::endl;
+      _endthreadex( 0 );
+      return 0;
+    }
     T* instance = param->instance;
     LPVOID lpParam = param->lpParam;
     Thread *pCore = param->pCore;
     delete param;
-
-    unsigned returnCode = instance->threadProc(lpParam);
+    unsigned returnCode = 0;
+    try {
+      returnCode = instance->threadProc(lpParam);
+    } catch (...) {
+      std::wcerr << _T("Unhandled exception in thread a :(") << std::endl;
+    }
     pCore->terminate();
     _endthreadex( 0 );
     return returnCode;
-
-//    _endthread();
   }
 
@@ -149 +159 @@
    */
   void createThread(LPVOID lpParam = NULL) {
+    if (hMutex_ == NULL)
+      throw ThreadException(_T("No mutex in createThread (") + threadid_ + _T(") not started..."));
     thread_param* param = NULL;
     {
@@ -158 +170 @@
         throw ThreadException(_T("Thread already started, thread (") + threadid_ + _T(") not started..."));
       }
-//      assert(hStopEvent_ == NULL);
       param = new thread_param;
+      if (param == NULL)
+        throw ThreadException(_T("Failed to allocate memory for new thread: ") + threadid_);
       param->instance = pObject_ = new T;
-//      param->hStopEvent = hStopEvent_ = CreateEvent(NULL, TRUE, FALSE, NULL);
+      if (param->instance == NULL)
+        throw ThreadException(_T("Failed to allocate memory for new thread: ") + threadid_);
       param->lpParam = lpParam;
       param->pCore = this;
-    }
-    //hThread_ = reinterpret_cast<HANDLE>(::_beginthreadex(threadProc, 0, reinterpret_cast<VOID*>(param)));
-    //hThread = (HANDLE)_beginthreadex( NULL, 0, &SecondThreadFunc, NULL, 0, &threadID );
+      param->magic_id = THREAD_MAGIC_ID;
+    }
     uintptr_t thread_handle = ::_beginthreadex(NULL, 0, threadProc, reinterpret_cast<VOID*>(param), 0, &uThreadID);
     if (thread_handle == 0 || thread_handle == 1 || thread_handle == -1) {
@@ -179 +192 @@
    */
   bool exitThread(const unsigned int delay = 20000L) {
+    if (hMutex_ == NULL)
+      throw ThreadException(_T("No mutex in createThread (") + threadid_ + _T(") not started..."));
     DWORD dwWaitResult = -1;
     {
@@ -198 +213 @@
     }
     std::wcerr << _T("Failed to terminate thread: ") << threadid_ << _T("...") << std::endl;
-    //assert(false);
     return false;
   }

modules/CheckSystem/PDHCollector.cpp

@@ -47 +47 @@
   bool bUseIndex = false;
 
-  // Investigate enviornment and find out what to use
+  // Investigate environment and find out what to use
   try {
     OSVERSIONINFO osVer = systemInfo::getOSVersion();