Changeset 394f7a1 in nscp

Timestamp:

02/18/08 23:21:23 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

95e4ace

Parents:

c1fe385

Message:

+ Added propper output handling to process subsystem (now you can execute programs tat return "much" data.

+ Added select support for SSL_write (now you can send "any amount of data" to the (SSL) socket.

Since check_nrpe doesn't do this it wont work in that end, but still...

Files:

• AutoBuild.h (modified) (1 diff)
• NSC.dist (modified) (3 diffs)
• NSClient++-2005.sln (modified) (2 diffs)
• NSClient++.cpp (modified) (4 diffs)
• NSClient++.h (modified) (1 diff)
• changelog (modified) (1 diff)
• include/Mutex.h (modified) (1 diff)
• include/PDHCollectors.h (modified) (13 diffs)
• include/SSLSocket.cpp (modified) (2 diffs)
• include/SSLSocket.h (modified) (3 diffs)
• include/Socket.cpp (modified) (2 diffs)
• include/Socket.h (modified) (6 diffs)
• include/config.h (modified) (1 diff)
• include/strEx.h (modified) (1 diff)
• modules/CheckExternalScripts/CheckExternalScripts.cpp (modified) (3 diffs)
• modules/CheckExternalScripts/CheckExternalScripts.h (modified) (3 diffs)
• modules/CheckSystem/CheckSystem.cpp (modified) (2 diffs)
• modules/CheckSystem/PDHCollector.cpp (modified) (8 diffs)
• modules/CheckSystem/PDHCollector.h (modified) (2 diffs)
• modules/NRPEClient/NRPEClient-2005.vcproj (added)
• modules/NRPEClient/NRPEClient.cpp (added)
• modules/NRPEClient/NRPEClient.def (added)
• modules/NRPEClient/NRPEClient.h (added)
• modules/NRPEClient/stdafx.cpp (added)
• modules/NRPEClient/stdafx.h (added)
• modules/NRPEListener/NRPEListener-2005.vcproj (modified) (2 diffs)
• modules/NRPEListener/NRPEListener.cpp (modified) (8 diffs)
• modules/NRPEListener/NRPEListener.h (modified) (2 diffs)
• modules/NRPEListener/NRPEPacket.cpp (deleted)
• modules/NRPEListener/NRPEPacket.h (deleted)
• modules/NSCAAgent/NSCAAgent.cpp (modified) (3 diffs)
• modules/NSCAAgent/NSCAAgent.h (modified) (1 diff)
• modules/NSCAAgent/NSCAThread.cpp (modified) (3 diffs)
• modules/NSCAAgent/nsca_enrypt.hpp (modified) (1 diff)

AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,0,54
-#define PRODUCTVER     0,3,0,54
-#define STRFILEVER     _T("0.3.0.54")
-#define STRPRODUCTVER  _T("0.3.0.54")
-#define STRPRODUCTDATE  _T("2008-02-12")
+#define FILEVER        0,3,0,58
+#define PRODUCTVER     0,3,0,58
+#define STRFILEVER     _T("0.3.0.58")
+#define STRPRODUCTVER  _T("0.3.0.58")
+#define STRPRODUCTDATE  _T("2008-02-14")
 #endif // AUTOBUILD_H

NSC.dist

@@ -83 +83 @@
 ;socket_timeout=30
 
+[NRPE]
+;# NRPE PORT NUMBER
+;  This is the port the NRPEListener.dll will listen to.
+;port=5666
+;
+;# 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
+;
+;# USE SSL SOCKET
+;  This option controls if SSL should be used on the socket.
+;use_ssl=1
+;
+;# BIND TO ADDRESS
+;  Allows you to bind server to a specific local address. This has to be a dotted ip adress not a hostname.
+;  Leaving this blank will bind to all avalible IP adresses.
+; bind_to_address=
+;
+;# ALLOWED HOST ADDRESSES
+;  This is a comma-delimited list of IP address of hosts that are allowed to talk to NRPE deamon.
+;  If you leave this blank the global version will be used instead.
+;allowed_hosts=
+;
+;# SCRIPT DIRECTORY
+;  All files in this directory will become check commands.
+;  *WARNING* This is undoubtedly dangerous so use with care!
+;script_dir=scripts\
+;
+;# SOCKET TIMEOUT
+;  Timeout when reading packets on incoming sockets. If the data has not arrived withint this time we will bail out.
+;socket_timeout=30
 
 [Check System]
@@ -136 +175 @@
 
 
-[NRPE]
-;# NRPE PORT NUMBER
-;  This is the port the NRPEListener.dll will listen to.
-;port=5666
-;
-;# 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
-;
-;# USE SSL SOCKET
-;  This option controls if SSL should be used on the socket.
-;use_ssl=1
+
+
+; [includes]
+;# The order when used is "reversed" thus the last included file will be "first"
+;# Included files can include other files (be carefull only do basic recursive checking)
+;
+; myotherfile.ini
+; real.ini
+
+
+[NSCA Agent]
+;# CHECK INTERVALL (in seconds)
+;   How often we should run the checks and submit the results.
+;interval=5
+;
+;# ENCRYPTION METHOD
+;   This option determines the method by which the send_nsca client will encrypt the packets it sends 
+;   to the nsca daemon. The encryption method you choose will be a balance between security and 
+;   performance, as strong encryption methods consume more processor resources.
+;   You should evaluate your security needs when choosing an encryption method.
+;
+; Note: The encryption method you specify here must match the decryption method the nsca daemon uses 
+;       (as specified in the nsca.cfg file)!!
+; Values:
+; 0 = None  (Do NOT use this option)
+; 1 = Simple XOR  (No security, just obfuscation, but very fast)
+;   2 = DES
+;   3 = 3DES (Triple DES)
+; 4 = CAST-128
+; 6 = xTEA
+; 8 = BLOWFISH
+; 9 = TWOFISH
+; 11 = RC2
+; 14 = RIJNDAEL-128 (AES)
+; 20 = SERPENT
+;encryption_method=14
+;
+;# ENCRYPTION PASSWORD
+;  This is the password/passphrase that should be used to encrypt the sent packets. 
+;password=
 ;
 ;# BIND TO ADDRESS
 ;  Allows you to bind server to a specific local address. This has to be a dotted ip adress not a hostname.
-;  Leaving this blank will bind to all avalible IP adresses.
-; bind_to_address=
-;
-;# ALLOWED HOST ADDRESSES
-;  This is a comma-delimited list of IP address of hosts that are allowed to talk to NRPE deamon.
-;  If you leave this blank the global version will be used instead.
-;allowed_hosts=
-;
-;# SCRIPT DIRECTORY
-;  All files in this directory will become check commands.
-;  *WARNING* This is undoubtedly dangerous so use with care!
-;script_dir=scripts\
-;
-;# SOCKET TIMEOUT
-;  Timeout when reading packets on incoming sockets. If the data has not arrived withint this time we will bail out.
-;socket_timeout=30
-
-
+;  Leaving this blank will bind to "one" local interface.
+; -- not supported as of now -- 
+;bind_to_address=
+;
+;# LOCAL HOST NAME
+;  The name of this host (if empty "computername" will be used.
+;hostname=
+;
+;# NAGIOS SERVER ADDRESS
+;  The address to the nagios server to submit results to.
+;nsca_host=192.168.0.1
+;
+;# NAGIOS SERVER PORT
+;  The port to the nagios server to submit results to.
+;nsca_port=5667
+;
+
+;# CHECK COMMAND LIST
+;  The checks to run everytime we submit results back to nagios
+;  Any command(alias/key) starting with a host_ is sent as HOST_COMMAND others are sent as SERVICE_COMMANDS
+;  where the alias/key is used as service name.
+;
+[NSCA Commands]
+;my_cpu_check=checkCPU warn=80 crit=90 time=20m time=10s time=4
+;my_mem_check=checkMem MaxWarn=80% MaxCrit=90% ShowAll type=page
+;my_svc_check=checkServiceState CheckAll exclude=wampmysqld exclude=MpfService
+;host_check=check_ok
 
 [NRPE Handlers]
@@ -206 +274 @@
 ;check_nok=scripts\xlong.bat
 ;check_vbs=cscript.exe //T:30 //NoLogo scripts\check_vb.vbs
-
-
-; [includes]
-;# The order when used is "reversed" thus the last included file will be "first"
-;# Included files can include other files (be carefull only do basic recursive checking)
-;
-; myotherfile.ini
-; real.ini
-
-
-[NSCA Agent]
-;# CHECK INTERVALL (in seconds)
-;   How often we should run the checks and submit the results.
-;interval=5
-;
-;# ENCRYPTION METHOD
-;   This option determines the method by which the send_nsca client will encrypt the packets it sends 
-;   to the nsca daemon. The encryption method you choose will be a balance between security and 
-;   performance, as strong encryption methods consume more processor resources.
-;   You should evaluate your security needs when choosing an encryption method.
-;
-; Note: The encryption method you specify here must match the decryption method the nsca daemon uses 
-;       (as specified in the nsca.cfg file)!!
-; Values:
-; 0 = None  (Do NOT use this option)
-; 1 = Simple XOR  (No security, just obfuscation, but very fast)
-;   2 = DES
-;   3 = 3DES (Triple DES)
-; 4 = CAST-128
-; 6 = xTEA
-; 8 = BLOWFISH
-; 9 = TWOFISH
-; 11 = RC2
-; 14 = RIJNDAEL-128 (AES)
-; 20 = SERPENT
-;encryption_method=14
-;
-;# ENCRYPTION PASSWORD
-;  This is the password/passphrase that should be used to encrypt the sent packets. 
-;password=
-;
-;# BIND TO ADDRESS
-;  Allows you to bind server to a specific local address. This has to be a dotted ip adress not a hostname.
-;  Leaving this blank will bind to "one" local interface.
-; -- not supported as of now -- 
-;bind_to_address=
-;
-;# LOCAL HOST NAME
-;  The name of this host (if empty "computername" will be used.
-;hostname=
-;
-;# NAGIOS SERVER ADDRESS
-;  The address to the nagios server to submit results to.
-;nsca_host=192.168.0.1
-;
-;# NAGIOS SERVER PORT
-;  The port to the nagios server to submit results to.
-;nsca_port=5667
-;
-
-;# CHECK COMMAND LIST
-;  The checks to run everytime we submit results back to nagios
-;  Any command(alias/key) starting with a host_ is sent as HOST_COMMAND others are sent as SERVICE_COMMANDS
-;  where the alias/key is used as service name.
-;
-[NSCA Commands]
-;my_cpu_check=checkCPU warn=80 crit=90 time=20m time=10s time=4
-;my_mem_check=checkMem MaxWarn=80% MaxCrit=90% ShowAll type=page
-;my_svc_check=checkServiceState CheckAll exclude=wampmysqld exclude=MpfService
-;host_check=check_ok

NSClient++-2005.sln

@@ -52 +52 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Crypt++", "..\Crypt++\Crypt++.vcproj", "{630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NRPEClient", "modules\NRPEClient\NRPEClient-2005.vcproj", "{4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}"
 EndProject
 Global
@@ -720 +722 @@
     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|Win32.Build.0 = Release|Win32
     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A}.Release|x64.ActiveCfg = Release|Win32
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|Any CPU.ActiveCfg = Debug|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|Itanium.ActiveCfg = Debug|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|Mixed Platforms.ActiveCfg = Debug|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|Mixed Platforms.Build.0 = Debug|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|Win32.ActiveCfg = Debug|Win32
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|Win32.Build.0 = Debug|Win32
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|x64.ActiveCfg = Debug|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|x64.Build.0 = Debug|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug-MemCheck|Any CPU.ActiveCfg = Debug-MemCheck|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug-MemCheck|Itanium.ActiveCfg = Debug-MemCheck|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug-MemCheck|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug-MemCheck|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug-MemCheck|Win32.ActiveCfg = Debug-MemCheck|Win32
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug-MemCheck|Win32.Build.0 = Debug-MemCheck|Win32
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug-MemCheck|x64.ActiveCfg = Debug-MemCheck|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug-MemCheck|x64.Build.0 = Debug-MemCheck|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Distribution|Any CPU.ActiveCfg = Distribution|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Distribution|Itanium.ActiveCfg = Distribution|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Distribution|Mixed Platforms.ActiveCfg = Distribution|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Distribution|Mixed Platforms.Build.0 = Distribution|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Distribution|Win32.ActiveCfg = Distribution|Win32
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Distribution|Win32.Build.0 = Distribution|Win32
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Distribution|x64.ActiveCfg = Distribution|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Distribution|x64.Build.0 = Distribution|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Nightly|Any CPU.ActiveCfg = Nightly|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Nightly|Itanium.ActiveCfg = Nightly|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Nightly|Mixed Platforms.ActiveCfg = Nightly|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Nightly|Mixed Platforms.Build.0 = Nightly|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Nightly|Win32.ActiveCfg = Nightly|Win32
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Nightly|Win32.Build.0 = Nightly|Win32
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Nightly|x64.ActiveCfg = Nightly|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Nightly|x64.Build.0 = Nightly|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Release|Any CPU.ActiveCfg = Release|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Release|Itanium.ActiveCfg = Release|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Release|Mixed Platforms.ActiveCfg = Release|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Release|Mixed Platforms.Build.0 = Release|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Release|Win32.ActiveCfg = Release|Win32
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Release|Win32.Build.0 = Release|Win32
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Release|x64.ActiveCfg = Release|x64
+    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Release|x64.Build.0 = Release|x64
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

NSClient++.cpp

@@ -40 +40 @@
 int wmain(int argc, TCHAR* argv[], TCHAR* envp[])
 {
+  srand( (unsigned)time( NULL ) );
   int nRetCode = 0;
   if ( (argc > 1) && ((*argv[1] == '-') || (*argv[1] == '/')) ) {
@@ -133 +134 @@
       std::wstring s = _T("");
       std::wstring buff = _T("");
-      std::wcin >> s;
-      while (s != _T("exit")) {
-        if (std::cin.peek() < 15) {
+      while (true) {
+        std::wcin >> s;
+        if (s == _T("exit")) {
+          std::wcout << _T("Exiting...") << std::endl;
+          break;
+        } else if (s == _T("off") && buff == _T("debug ")) {
+          std::wcout << _T("Setting debug log off...") << std::endl;
+          mainClient.enableDebug(false);
+        } else if (s == _T("on") && buff == _T("debug ")) {
+          std::wcout << _T("Setting debug log on...") << std::endl;
+          mainClient.enableDebug(true);
+        } else if (std::cin.peek() < 15) {
           buff += s;
           strEx::token t = strEx::getToken(buff, ' ');
@@ -148 +158 @@
           buff += s + _T(" ");
         }
-        std::wcin >> s;
       }
       mainClient.TerminateService();
@@ -533 +542 @@
 
 bool NSClientT::logDebug() {
-  typedef enum status {unknown, debug, nodebug };
-  static status d = unknown;
-  if (d == unknown) {
+  if (debug_ == log_unknown) {
     try {
       if (Settings::getInstance()->getInt(_T("log"), _T("debug"), 0) == 1)
-        d = debug;
+        debug_ = log_debug;
       else
-        d = nodebug;
+        debug_ = log_nodebug;
     } catch (SettingsException e) {
-      d = debug;
-    }
-  }
-  return (d == debug);
+      debug_ = log_debug;
+    }
+  }
+  return (debug_ == log_debug);
 }
 

NSClient++.h

@@ -70 +70 @@
   MutexRW  m_mutexRWcmdDescriptions;
   cmdMap cmdDescriptions_;
-  bool debug_;
+  typedef enum log_status {log_unknown, log_debug, log_nodebug };
+  log_status debug_;
 
 public:
   // c-tor, d-tor
-  NSClientT(void) : debug_(false) {}
+  NSClientT(void) : debug_(log_unknown) {}
   virtual ~NSClientT(void) {}
   void enableDebug(bool debug = true) {
-    debug_ = debug;
+    if (debug)
+      debug_ = log_debug;
+    else
+      debug_ = log_nodebug;
   }
 

changelog

@@ -5 +5 @@
  * Add module for relaying events
  * Add API for rehashing the daemon (or implement it the API is there but does nothing)
+
+2008-02-18 MickeM
+ + Added propper output handling to process subsystem (now you can execute programs tat return "much" data.
+ + Added select support for SSL_write (now you can send "any amount of data" to the (SSL) socket.
+   Since check_nrpe doesn't do this it wont work in that end, but still...
+
+2008-02-16 MickeM
+ + Refactored ExternalCommand handling so NRPE and new module does the same thing.
 
 2008-02-14 MickeM

include/Mutex.h

@@ -174 +174 @@
   }
 };
+
+class ManualMutexLock {
+private:
+  bool bHasMutex;   // Status: true if we have a mutex lock
+  HANDLE hMutex_;   // Handle to the mutex object.
+  DWORD dwWaitResult; // Result from the mutex operations
+public:
+  /**
+  * Default c-tor.
+  * Waits for the mutex object.
+  * @param hMutex The mutex to use
+  * @timeout The timeout before abandoning wait
+  */
+  ManualMutexLock(HANDLE hMutex) : bHasMutex(false), hMutex_(hMutex) {}
+  
+  /**
+  * Waits for the mutex object.
+  * @timeout The timeout before abandoning wait
+  */
+  void lock(DWORD timeout = 5000L) {
+    if (hMutex_ == NULL) {
+      std::wcout << _T("Error in mutex lock: ") << std::endl;
+      bHasMutex = false;
+      return;
+    }
+    dwWaitResult = WaitForSingleObject(hMutex_, timeout);
+    switch (dwWaitResult) {
+      // The thread got mutex ownership.
+    case WAIT_OBJECT_0:
+      bHasMutex = true;
+      break;
+    case WAIT_TIMEOUT: 
+      bHasMutex = false;
+      break;
+    case WAIT_ABANDONED: 
+      bHasMutex = false;
+      break;
+    }
+  }
+  /**
+  * An attempt to simplify the has mutex thingy (don't know if it works, haven't tried it since I wrote this class a few years ago :)
+  * @return true if we have a mutex lock.
+  */
+  operator bool () const {
+    return bHasMutex;
+  }
+  /**
+  * Check if we actually got the mutex (might have timed out)
+  * @return 
+  */
+  bool hasMutex() const {
+    return bHasMutex;
+  }
+  /**
+  * Default d-tor.
+  * Release the mutex
+  */
+  virtual ~ManualMutexLock() {
+    if (bHasMutex)
+      ReleaseMutex(hMutex_);
+    bHasMutex = false;
+  }
+  /**
+  * Release the mutex
+  */
+  void release() {
+    if (bHasMutex)
+      ReleaseMutex(hMutex_);
+    bHasMutex = false;
+  }
+  /**
+  * Get the result of the wait operation.
+  * @return Result of the wait operation
+  */
+  DWORD getWaitResult() const {
+    return dwWaitResult;
+  }
+};

include/PDHCollectors.h

@@ -22 +22 @@
 
 #include <PDHCounter.h>
-
+#include <Mutex.h>
 namespace PDHCollectors {
   const int format_large = 0x00000400;
@@ -28 +28 @@
   const int format_double = 0x00000200;
 
-  template <class TType = __int64, int TCollectionFormat = format_large>
+  class PDHException {
+    std::wstring error_;
+  public:
+    PDHException(std::wstring error) : error_(error) {}
+    std::wstring getError() const { return error_; }
+
+  };
+  class TPDHCounterMutex {
+  public:
+    virtual void lock() = 0;
+    virtual bool hasLock(bool silent = true) = 0;
+    virtual void release() = 0;
+  };
+
+  class PDHCounterNoMutex : public TPDHCounterMutex {
+  public:
+    void lock() {}
+    bool hasLock(bool silent = true) {
+      return true;
+    }
+    void release() {}
+  };
+  class PDHCounterNormalMutex : public TPDHCounterMutex {
+    MutexHandler mutex_;
+    ManualMutexLock lock_;
+  public:
+    PDHCounterNormalMutex() : lock_(mutex_) {}
+    void lock() {
+      lock_.lock();
+    }
+    bool hasLock(bool silent = true) {
+      if (!silent && !lock_.hasMutex()) {
+        std::wcout << _T("We never got the mutex... sorry...") << std::endl;
+      }
+      return lock_.hasMutex();
+    }
+    void release() {
+      lock_.release();
+    }
+  };
+  class PDHCounterMutexHandler {
+  private:
+    TPDHCounterMutex *mutex_; // Handle to the mutex object.
+  public:
+    /**
+    * Default c-tor.
+    * Waits for the mutex object.
+    * @param mutex The mutex to use
+    * @timeout The timeout before abandoning wait
+    */
+    PDHCounterMutexHandler(TPDHCounterMutex *mutex) : mutex_(mutex) {
+      if (mutex == NULL) {
+        std::wcout << _T("Error in mutex lock: ") << std::endl;
+        mutex = NULL;
+        return;
+      }
+      mutex->lock();
+    }
+    /**
+    * An attempt to simplify the has mutex thingy (don't know if it works, haven't tried it since I wrote this class a few years ago :)
+    * @return true if we have a mutex lock.
+    */
+    operator bool () const {
+      return mutex_!=NULL&&mutex_->hasLock();
+    }
+    /**
+    * Check if we actually got the mutex (might have timed out)
+    * @return 
+    */
+    bool hasLock(bool silent = true) const {
+      return mutex_!=NULL&&mutex_->hasLock(silent);
+    }
+    /**
+    * Default d-tor.
+    * Release the mutex
+    */
+    virtual ~PDHCounterMutexHandler() {
+      mutex_->release();
+    }
+  };
+
+  template <class TType, int TCollectionFormat, class TMutextHandler = PDHCounterNoMutex>
   class StaticPDHCounterListener {};
 
-  template <class TType>
-  class StaticPDHCounterListener<TType, format_double> : public PDH::PDHCounterListener {
+  template <class TType, class TMutextHandler>
+  class StaticPDHCounterListener<TType, format_double, TMutextHandler> : public PDH::PDHCounterListener {
     TType value_;
+    TMutextHandler mutex_;
   public:
     StaticPDHCounterListener() : value_(0) {}
     virtual void collect(const PDH::PDHCounter &counter) {
+      PDHCounterMutexHandler mutex(&mutex_);
+      if (!mutex.hasLock())
+        return;
       value_ = counter.getDoubleValue();
     }
     void attach(const PDH::PDHCounter &counter){}
     void detach(const PDH::PDHCounter &counter){}
-    TType getValue() const {
+    TType getValue() {
+      PDHCounterMutexHandler mutex(&mutex_);
+      if (!mutex.hasLock())
+        return -1;
       return value_;
     }
@@ -49 +137 @@
   };
 
-  template <class TType>
-  class StaticPDHCounterListener<TType, format_long> : public PDH::PDHCounterListener {
+  template <class TType, class TMutextHandler>
+  class StaticPDHCounterListener<TType, format_long, TMutextHandler> : public PDH::PDHCounterListener {
     TType value_;
+    TMutextHandler mutex_;
   public:
     StaticPDHCounterListener() : value_(0) {}
     virtual void collect(const PDH::PDHCounter &counter) {
+      PDHCounterMutexHandler mutex(&mutex_);
+      if (!mutex.hasLock())
+        return;
       value_ = counter.getIntValue();
     }
     void attach(const PDH::PDHCounter &counter){}
     void detach(const PDH::PDHCounter &counter){}
-    TType getValue() const {
+    TType getValue() {
+      PDHCounterMutexHandler mutex(&mutex_);
+      if (!mutex.hasLock())
+        return -1;
       return value_;
     }
@@ -67 +162 @@
   };
 
-  template <class TType>
-  class StaticPDHCounterListener<TType, format_large> : public PDH::PDHCounterListener {
+  template <class TType, class TMutextHandler>
+  class StaticPDHCounterListener<TType, format_large, TMutextHandler> : public PDH::PDHCounterListener {
+    TMutextHandler mutex_;
     TType value_;
   public:
     StaticPDHCounterListener() : value_(0) {}
     virtual void collect(const PDH::PDHCounter &counter) {
+      PDHCounterMutexHandler mutex(&mutex_);
+      if (!mutex.hasLock())
+        return;
       value_ = counter.getInt64Value();
     }
     void attach(const PDH::PDHCounter &counter){}
     void detach(const PDH::PDHCounter &counter){}
-    TType getValue() const {
+    TType getValue() {
+      PDHCounterMutexHandler mutex(&mutex_);
+      if (!mutex.hasLock())
+        return -1;
       return value_;
     }
@@ -86 +188 @@
 
 
-  template <class TType = __int64>
+  template <class TType, class TMutextHandler>
   class RoundINTPDHBufferListenerImpl : public PDH::PDHCounterListener {
+    TMutextHandler mutex_;
     unsigned int length;
     TType *buffer;
@@ -94 +197 @@
     RoundINTPDHBufferListenerImpl() : buffer(NULL), length(0), current(0) {}
     RoundINTPDHBufferListenerImpl(int length_) : length(length_), current(0) {
+      PDHCounterMutexHandler mutex(mutex_);
+      if (!mutex.hasLock())
+        return;
       buffer = new int[length];
       for (unsigned int i=0; i<length;i++)
@@ -99 +205 @@
     }
     virtual ~RoundINTPDHBufferListenerImpl() {
+      PDHCounterMutexHandler mutex(&mutex_);
+      if (!mutex.hasLock())
+        return;
       delete [] buffer;
     }
@@ -110 +219 @@
     */
     void resize(int newLength) {
+      PDHCounterMutexHandler mutex(&mutex_);
+      if (!mutex.hasLock())
+        return;
       delete [] buffer;
 
@@ -126 +238 @@
     void detach(const PDH::PDHCounter &counter){}
     void pushValue(TType value) {
+      PDHCounterMutexHandler mutex(&mutex_);
+      if (!mutex.hasLock())
+        return;
       if (buffer == NULL)
         return;
@@ -134 +249 @@
         current = 0;
     }
-    double getAvrage(unsigned int backItems) const {
+    double getAvrage(unsigned int backItems) {
+      PDHCounterMutexHandler mutex(&mutex_);
+      if (!mutex.hasLock(true))
+        throw PDHException(_T("Failed to get mutex :("));
       if ((backItems == 0) || (backItems >= length))
         return -1;
@@ -157 +275 @@
 
 
-  template <class TType = __int64, DWORD TCollectionFormat = format_large>
-  class RoundINTPDHBufferListener : public RoundINTPDHBufferListenerImpl<TType> {
-  };
-
-  template <class TType>
-  class RoundINTPDHBufferListener<TType, format_double> : public RoundINTPDHBufferListenerImpl<TType> {
+  template <class TType, DWORD TCollectionFormat, class TMutextHandler = PDHCounterNoMutex>
+  class RoundINTPDHBufferListener : public RoundINTPDHBufferListenerImpl<TType, TMutextHandler> {
+  };
+
+  template <class TType, class TMutextHandler>
+  class RoundINTPDHBufferListener<TType, format_double, TMutextHandler> : public RoundINTPDHBufferListenerImpl<TType, TMutextHandler> {
   public:
     RoundINTPDHBufferListener() {}
@@ -175 +293 @@
   };
 
-  template <class TType>
-  class RoundINTPDHBufferListener<TType, format_long> : public RoundINTPDHBufferListenerImpl<TType> {
+  template <class TType, class TMutextHandler>
+  class RoundINTPDHBufferListener<TType, format_long, TMutextHandler> : public RoundINTPDHBufferListenerImpl<TType, TMutextHandler> {
   public:
     RoundINTPDHBufferListener() {}
@@ -189 +307 @@
   };
 
-  template <class TType>
-  class RoundINTPDHBufferListener<TType, format_large> : public RoundINTPDHBufferListenerImpl<TType> {
+  template <class TType, class TMutextHandler>
+  class RoundINTPDHBufferListener<TType, format_large, TMutextHandler> : public RoundINTPDHBufferListenerImpl<TType, TMutextHandler> {
   public:
     RoundINTPDHBufferListener() {}

include/SSLSocket.cpp

@@ -68 +68 @@
 
 
-bool simpleSSL::sSSL::readAll(simpleSocket::Socket *report_to, simpleSocket::DataBuffer &buffer, unsigned int tmpBufferLength /* = 1024*/, int maxLength /*= -1*/) {
+bool simpleSSL::sSSL::readAll(simpleSocket::DataBuffer &buffer, unsigned int tmpBufferLength /* = 1024*/, int maxLength /*= -1*/) {
   char *tmpBuffer = new char[tmpBufferLength+1];
   if (!ssl_)
@@ -81 +81 @@
     if ((rc == SSL_ERROR_WANT_READ) || (rc == SSL_ERROR_WANT_WRITE))
       return true;
-    report_to->printError(_T(__FILE__), __LINE__, _T("Could not read from socket: ") + strEx::itos(rc));
     throw simpleSocket::SocketException(_T("Could not read from socket: ") + strEx::itos(rc));
   }
   return n>0;
 }
-void simpleSSL::sSSL::send(const char * buf, unsigned int len) {
+
+bool simpleSSL::sSSL::sendAll(const char * buffer, unsigned int len) {
   if (!ssl_)
     create();
-  int rc = SSL_write(ssl_, buf, len);
-  if (rc <= 0)
-    throw SSLException(_T("Socket write failed: "), rc, getError(rc));
+  int n = SSL_write(ssl_, buffer, len);
+  if (n <= 0) {
+    int rc = getError(n);
+    if ((rc == SSL_ERROR_WANT_READ) || (rc == SSL_ERROR_WANT_WRITE))
+      return true;
+    throw simpleSocket::SocketException(_T("Could not write to socket: ") + strEx::itos(rc));
+  }
+  return false;
 }
 

include/SSLSocket.h

@@ -230 +230 @@
       context_ = context;
     }
-    bool readAll (simpleSocket::Socket *report_to, simpleSocket::DataBuffer &buffer, unsigned int tmpBufferLength = 1024, int maxLength = -1);
+    bool readAll (simpleSocket::DataBuffer &buffer, unsigned int tmpBufferLength = 1024, int maxLength = -1);
+    bool sendAll(const char * buffer, unsigned int len);
     void send(const char * buf, unsigned int len);
   };
@@ -262 +263 @@
     virtual bool readAll (simpleSocket::DataBuffer &buffer, unsigned int tmpBufferLength = 1024, int maxLength = -1) {
       try {
-        return ssl.readAll(this, buffer, tmpBufferLength, maxLength);
-      } catch (simpleSSL::SSLException e) {
-        throw simpleSocket::SocketException(e.getMessage());
-      }
-    }
+        return ssl.readAll(buffer, tmpBufferLength, maxLength);
+      } catch (simpleSSL::SSLException e) {
+        throw simpleSocket::SocketException(e.getMessage());
+      } catch (...) {
+        throw simpleSocket::SocketException(_T("Unhandeled socket exception"));
+      }
+    }
+    virtual bool sendAll(const char * buffer, unsigned int len) {
+      try {
+        return ssl.sendAll(buffer, len);
+      } catch (simpleSSL::SSLException e) {
+        throw simpleSocket::SocketException(e.getMessage());
+      } catch (...) {
+        throw simpleSocket::SocketException(_T("Unhandeled socket exception"));
+      }
+    }
+    /*
+
     virtual int send(const char * buf, unsigned int len, int flags = 0) {
       try {
@@ -275 +289 @@
       return 0;
     }
+    */
     virtual void close() {
       ssl.shutdown();

include/Socket.cpp

@@ -50 +50 @@
         break;
       n=recv(socket_,tmpBuffer,tmpBufferLength,0);
-      std::wcout << _T("read (2): ") << n << std::endl;
     } else {
       // Buffer not full, we got it "all"
@@ -68 +67 @@
 }
 
+bool simpleSocket::Socket::sendAll(const char * buffer, unsigned int len) {
+  int n = send(buffer, len, 0);
+  if (n == SOCKET_ERROR) {
+    int ret = ::WSAGetLastError();
+    if (ret == WSAEWOULDBLOCK)
+      return false;
+    throw SocketException(_T("recv returned SOCKET_ERROR: "), ret);
+  }
+  return false;
+}
 
 /**

include/Socket.h

@@ -143 +143 @@
       buffer_[length_] = 0;
     }
-    std::wstring toString() {
-      std::wstringstream ss;
-      for (unsigned int i =0;i<length_;i++) {
-        if (i%64==0) {
-          ss << std::endl;
-        }
-        if (buffer_[i] < 30 || buffer_[i] > 'z')
-          ss << _T(" ");
-        else
-          ss << buffer_[i];
-      }
-      return ss.str();
+    std::string toString() {
+      return strEx::format_buffer(buffer_, length_);
     }
   };
@@ -163 +153 @@
     sockaddr_in from_;
     sockaddr_in to_;
+    fd_set read_, write_, excp_;
 
   public:
     Socket() : socket_(NULL) {
+      FD_ZERO(&read_);
+      FD_ZERO(&write_);
+      FD_ZERO(&excp_);
     }
     Socket(SOCKET socket) : socket_(socket) {
+      FD_ZERO(&read_);
+      FD_ZERO(&write_);
+      FD_ZERO(&excp_);
     }
     Socket(int type, int protocol) : socket_(NULL) {
       socket_ = ::socket(AF_INET, type, protocol);
+      FD_ZERO(&read_);
+      FD_ZERO(&write_);
+      FD_ZERO(&excp_);
     }
     Socket(bool create) : socket_(NULL) {
       if (create)
         socket_ = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+      FD_ZERO(&read_);
+      FD_ZERO(&write_);
+      FD_ZERO(&excp_);
     }
 
@@ -181 +184 @@
       from_ = other.from_;
       other.socket_ = NULL;
+      read_ = other.read_;
+      write_ = other.write_;
+      excp_ = other.excp_;
     }
     virtual ~Socket() {
@@ -217 +223 @@
     virtual void setNonBlock() {
       unsigned long NoBlock = 1;
+      FD_SET(socket_, &read_);
+      FD_SET(socket_, &write_);
+      FD_SET(socket_, &excp_);
       this->ioctlsocket(FIONBIO, &NoBlock);
     }
+    virtual bool canRead(long timeout = -1) {
+      timeval timeout_;
+      timeout_.tv_sec = timeout;
+      FD_SET(socket_, &read_);
+      FD_SET(socket_, &write_);
+      FD_SET(socket_, &excp_);
+      if (timeout == -1)
+        ::select(NULL, &read_, &write_, &excp_, NULL);
+      else
+        ::select(NULL, &read_, &write_, &excp_, &timeout_);
+      if (FD_ISSET(socket_, &read_))
+        return true;
+      return false;
+    }
+    virtual bool canWrite(long timeout = -1) {
+      timeval timeout_;
+      timeout_.tv_sec = timeout;
+      FD_SET(socket_, &read_);
+      FD_SET(socket_, &write_);
+      FD_SET(socket_, &excp_);
+      if (timeout == -1)
+        ::select(NULL, &read_, &write_, &excp_, NULL);
+      else
+        ::select(NULL, &read_, &write_, &excp_, &timeout_);
+      return FD_ISSET(socket_, &write_);
+    }
+
     static unsigned long inet_addr(std::wstring addr) {
       return ::inet_addr(strEx::wstring_to_string(addr).c_str());
@@ -268 +304 @@
     }
     virtual bool readAll(DataBuffer &buffer, unsigned int tmpBufferLength = 1024, int maxLength = -1);
+    virtual bool sendAll(const char * buffer, unsigned int len);
+
+    int inline sendAll(DataBuffer &buffer) {
+      return sendAll(buffer.getBuffer(), buffer.getLength());
+    }
+
+    virtual int send(const char * buf, unsigned int len, int flags = 0) {
+      assert(socket_);
+      return ::send(socket_, buf, len, flags);
+    }
+    int inline send(DataBuffer &buffer, int flags = 0) {
+      return send(buffer.getBuffer(), buffer.getLength(), flags);
+    }
 
     virtual void socket(int af, int type, int protocol ) {
@@ -300 +349 @@
       from_.sin_addr.s_addr=addr;
       from_.sin_port=port;
-    }
-    virtual int send(const char * buf, unsigned int len, int flags = 0) {
-      assert(socket_);
-      return ::send(socket_, buf, len, flags);
-    }
-    int inline send(DataBuffer &buffer, int flags = 0) {
-      return send(buffer.getBuffer(), buffer.getLength(), flags);
     }
     virtual void ioctlsocket(long cmd, u_long *argp) {

include/config.h

@@ -163 +163 @@
 #define NSCA_PASSWORD _T("password")
 #define NSCA_PASSWORD_DEFAULT _T("")
+#define NSCA_DEBUG_THREADS _T("debug_threads")
+#define NSCA_DEBUG_THREADS_DEFAULT 1
 
 #define C_SYSTEM_SVC_ALL_0 _T("check_all_services[SERVICE_BOOT_START]")

include/strEx.h

@@ -89 +89 @@
   }
 
+  inline std::wstring format_buffer(const wchar_t* buf, unsigned int len) {
+    std::wstringstream ss;
+    std::wstring chars;
+    for (unsigned int i=0;i<len;i++) {
+      ss << std::hex << buf[i];
+      ss << _T(", ");
+      if (buf[i] >= ' ' && buf[i] <= 'z')
+        chars += buf[i];
+      else
+        chars += '?';
+      if (i%32==0) {
+        ss << chars;
+        ss << _T("\n");
+        chars = _T("");
+      }
+    }
+    return ss.str();
+  }
+  inline std::string format_buffer(const char* buf, unsigned int len) {
+    std::stringstream ss;
+    std::string chars;
+    for (unsigned int i=0;i<len;i++) {
+      if (i%32==0) {
+        if (i > 0) {
+          ss << chars;
+          ss << "\n";
+        }
+        chars = "";
+        ss << std::hex << std::setw(8) << std::setfill('0') << i;
+        ss << ": ";
+      }
+      ss << std::hex << std::setw(2) << std::setfill('0') << static_cast<int>(static_cast<unsigned char>(buf[i]));
+      ss << ", ";
+      if (buf[i] < 30 || buf[i] == 127)
+        chars += '?';
+      else
+        chars += buf[i];
+    }
+    return ss.str();
+  }
+
   inline std::wstring format_date(time_t time, std::wstring format = _T("%Y-%m-%d %H:%M:%S")) {
     TCHAR buf[51];

modules/CheckExternalScripts/CheckExternalScripts.cpp

@@ -91 +91 @@
     addAllScriptsFrom(scriptDirectory_);
   }
+  root_ = NSCModuleHelper::getBasePath();
   return true;
 }
@@ -136 +137 @@
     return NSCModuleHelper::InjectSplitAndCommand(cd.command, cd.arguments, ' ', message, perf, true);
   } else {
-    return executeNRPECommand(cd.command + _T(" ") + args, message, perf);
+    int result = process::executeProcess(root_, cd.command + _T(" ") + args, message, perf, timeout);
+    if (!NSCHelper::isNagiosReturnCode(result)) {
+      NSC_LOG_ERROR_STD(_T("The command (") + cd.command + _T(") returned an invalid return code: ") + strEx::itos(result));
+      return NSCAPI::returnUNKNOWN;
+    }
+    return NSCHelper::int2nagios(result);
     /*
   } else if (cd.type == script_dir) {
@@ -149 +155 @@
 
 }
-#define MAX_INPUT_BUFFER 1024
-
-int CheckExternalScripts::executeNRPECommand(std::wstring command, std::wstring &msg, std::wstring &perf)
-{
-  NSCAPI::nagiosReturn result;
-  PROCESS_INFORMATION pi;
-  STARTUPINFO si;
-  HANDLE hChildOutR, hChildOutW, hChildInR, hChildInW;
-  SECURITY_ATTRIBUTES sec;
-  DWORD dwstate, dwexitcode;
-  int retval;
-
-
-  // Set up members of SECURITY_ATTRIBUTES structure. 
-
-  sec.nLength = sizeof(SECURITY_ATTRIBUTES);
-  sec.bInheritHandle = TRUE;
-  sec.lpSecurityDescriptor = NULL;
-
-  // CreateProcess doesn't work with a const command
-  TCHAR *cmd = new TCHAR[command.length()+1];
-  if (cmd == NULL) {
-    NSC_LOG_ERROR(_T("Failed to allocate memory for command buffer (") + command + _T(")."));
-    return NSCAPI::returnUNKNOWN;
-  }
-  wcsncpy_s(cmd, command.length()+1, command.c_str(), command.length());
-  cmd[command.length()] = 0;
-  std::wstring root = NSCModuleHelper::getBasePath();
-
-  // Create Pipes
-  if (!CreatePipe(&hChildInR, &hChildInW, &sec, 0)) {
-    NSC_LOG_ERROR(_T("Failed to create pipe for (") + command + _T(") return code: ") + error::lookup::last_error());
-    return NSCAPI::returnUNKNOWN;
-  }
-  if (!CreatePipe(&hChildOutR, &hChildOutW, &sec, 0)) {
-    NSC_LOG_ERROR(_T("Failed to create pipe for (") + command + _T(") return code: ") + error::lookup::last_error());
-    return NSCAPI::returnUNKNOWN;
-  }
-
-  // Set up members of STARTUPINFO structure. 
-
-  ZeroMemory(&si, sizeof(STARTUPINFO));
-  si.cb = sizeof(STARTUPINFO);
-  si.dwFlags = STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
-  si.hStdInput = hChildInR;
-  si.hStdOutput = hChildOutW;
-  si.hStdError = hChildOutW;
-  si.wShowWindow = SW_HIDE;
-
-  // Create the child process. 
-  BOOL processOK = CreateProcess(NULL, cmd,        // command line 
-    NULL, // process security attributes 
-    NULL, // primary thread security attributes 
-    TRUE, // handles are inherited 
-    0,    // creation flags 
-    NULL, // use parent's environment 
-    root.c_str(), // use parent's current directory 
-    &si,  // STARTUPINFO pointer 
-    &pi); // receives PROCESS_INFORMATION 
-  delete [] cmd;
-
-  if (processOK) {
-    dwstate = WaitForSingleObject(pi.hProcess, 1000*timeout);
-    CloseHandle(hChildInR);
-    CloseHandle(hChildInW);
-    CloseHandle(hChildOutW);
-
-    if (dwstate == WAIT_TIMEOUT) {
-      TerminateProcess(pi.hProcess, 5);
-      msg = _T("The check (") + command + _T(") didn't respond within the timeout period (") + strEx::itos(timeout) + _T("s)!");
-      result = NSCAPI::returnUNKNOWN;
-    } else {
-      DWORD dwread;
-      //TCHAR *buf = new TCHAR[MAX_INPUT_BUFFER+1];
-      char *buf = new char[MAX_INPUT_BUFFER+1];
-      //retval = ReadFile(hChildOutR, buf, MAX_INPUT_BUFFER*sizeof(WCHAR), &dwread, NULL);
-      retval = ReadFile(hChildOutR, buf, MAX_INPUT_BUFFER*sizeof(char), &dwread, NULL);
-      if (!retval || dwread == 0) {
-        msg = _T("No output available from command...");
-      } else {
-        buf[dwread] = 0;
-        msg = strEx::string_to_wstring(buf);
-        //msg = buf;
-        //strEx::token t = strEx::getToken(msg, '\n');
-        strEx::token t = strEx::getToken(msg, '|');
-        msg = t.first;
-        std::wstring::size_type pos = msg.find_last_not_of(_T("\n\r "));
-        if (pos != std::wstring::npos) {
-          if (pos == msg.size())
-            msg = msg.substr(0,pos);
-          else
-            msg = msg.substr(0,pos+1);
-        }
-        //if (msg[msg.size()-1] == '\n')
-        perf = t.second;
-      }
-      delete [] buf;
-      if (GetExitCodeProcess(pi.hProcess, &dwexitcode) == 0) {
-        NSC_LOG_ERROR(_T("Failed to get commands (") + command + _T(") return code: ") + error::lookup::last_error());
-        dwexitcode = NSCAPI::returnUNKNOWN;
-      }
-      if (!NSCHelper::isNagiosReturnCode(dwexitcode)) {
-        NSC_LOG_ERROR(_T("The command (") + command + _T(") returned an invalid return code: ") + strEx::itos(dwexitcode));
-        dwexitcode = NSCAPI::returnUNKNOWN;
-      }
-      result = NSCHelper::int2nagios(dwexitcode);
-    }
-    CloseHandle(pi.hThread);
-    CloseHandle(pi.hProcess);
-    CloseHandle(hChildOutR);
-  }
-  else {
-    msg = _T("NSCP failed to create process (") + command + _T("): ") + error::lookup::last_error();
-    result = NSCAPI::returnUNKNOWN;
-    CloseHandle(hChildInR);
-    CloseHandle(hChildInW);
-    CloseHandle(hChildOutW);
-    CloseHandle(pi.hThread);
-    CloseHandle(pi.hProcess);
-    CloseHandle(hChildOutR);
-  }
-  return result;
-}
 
 

modules/CheckExternalScripts/CheckExternalScripts.h

@@ -23 +23 @@
 #include <map>
 #include <error.hpp>
+#include <execute_process.hpp>
 
 class CheckExternalScripts {
@@ -37 +38 @@
   unsigned int timeout;
   std::wstring scriptDirectory_;
+  std::wstring root_;
 
 public:
@@ -76 +78 @@
 
 private:
-  int executeNRPECommand(std::wstring command, std::wstring &msg, std::wstring &perf);
   void addAllScriptsFrom(std::wstring path);
   void addCommand(strEx::blindstr key, std::wstring cmd = _T(""), std::wstring args = _T("")) {

modules/CheckSystem/CheckSystem.cpp

@@ -402 +402 @@
     int value = pObject->getCPUAvrage(load.data + _T("m"));
     if (value == -1) {
-      msg = _T("ERROR: We don't collect data this far back: ") + load.getAlias();
+      msg = _T("ERROR: Could not get data for ") + load.getAlias() + _T(" perhaps we don't collect data this far back?");
       return NSCAPI::returnUNKNOWN;
     }
@@ -720 +720 @@
     }
   }
-  NSC_DEBUG_MSG_STD(_T("Perf data: ") + strEx::itos(bPerfData) + _T(":") + perf);
 
   if (msg.empty())

modules/CheckSystem/PDHCollector.cpp

@@ -159 +159 @@
   bool bInit = true;
 
-  if (!loadCounter(pdh)) {
-    pdh.removeAllCounters();
-    NSC_DEBUG_MSG_STD(_T("We aparently failed to load counters trying to use default (English) counters or those configured in nsc.ini"));
-    SetThreadLocale(MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT));
-    pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_MEM_PAGE_LIMIT, C_SYSTEM_MEM_PAGE_LIMIT_DEFAULT), &memCmtLim);
-    pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_MEM_PAGE, C_SYSTEM_MEM_PAGE_DEFAULT), &memCmt);
-    pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_UPTIME, C_SYSTEM_UPTIME_DEFAULT), &upTime);
-    pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_CPU, C_SYSTEM_MEM_CPU_DEFAULT), &cpu);
-    try {
-      pdh.open();
-    } catch (const PDH::PDHException &e) {
-      NSC_LOG_ERROR_STD(_T("Failed to open performance counters: ") + e.getError());
+  {
+    WriteLock lock(&mutex_, true, 5000);
+    if (!lock.IsLocked()) {
+      NSC_LOG_ERROR_STD(_T("Failed to get mutex when trying to start thread... thread will now die..."));
       bInit = false;
+    } else if (!loadCounter(pdh)) {
+      pdh.removeAllCounters();
+      NSC_DEBUG_MSG_STD(_T("We aparently failed to load counters trying to use default (English) counters or those configured in nsc.ini"));
+      SetThreadLocale(MAKELCID(MAKELANGID(LANG_ENGLISH,SUBLANG_ENGLISH_US),SORT_DEFAULT));
+      pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_MEM_PAGE_LIMIT, C_SYSTEM_MEM_PAGE_LIMIT_DEFAULT), &memCmtLim);
+      pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_MEM_PAGE, C_SYSTEM_MEM_PAGE_DEFAULT), &memCmt);
+      pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_UPTIME, C_SYSTEM_UPTIME_DEFAULT), &upTime);
+      pdh.addCounter(NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_CPU, C_SYSTEM_MEM_CPU_DEFAULT), &cpu);
+      try {
+        pdh.open();
+      } catch (const PDH::PDHException &e) {
+        NSC_LOG_ERROR_STD(_T("Failed to open performance counters: ") + e.getError());
+        bInit = false;
+      }
     }
   }
@@ -181 +187 @@
       std::list<std::wstring> errors;
       {
-        MutexLock mutex(mutexHandler);
-        if (!mutex.hasMutex()) 
+        ReadLock lock(&mutex_, true, 5000);
+        if (!lock.IsLocked()) 
           NSC_LOG_ERROR(_T("Failed to get Mutex!"));
         else {
@@ -210 +216 @@
 
   {
-    MutexLock mutex(mutexHandler);
-    if (!mutex.hasMutex()) {
+    WriteLock lock(&mutex_, true, 5000);
+    if (!lock.IsLocked()) {
       NSC_LOG_ERROR(_T("Failed to get Mute when closing thread!"));
     }
@@ -235 +241 @@
   if (hStopEvent_ == NULL)
     NSC_LOG_ERROR(_T("Stop event is not created!"));
-  else
-    if (!SetEvent(hStopEvent_)) {
+  else if (!SetEvent(hStopEvent_)) {
       NSC_LOG_ERROR_STD(_T("SetStopEvent failed"));
-    }
+  }
 }
 /**
@@ -247 +252 @@
 int PDHCollector::getCPUAvrage(std::wstring time) {
   unsigned int mseconds = strEx::stoui_as_time(time, checkIntervall_*100);
-  MutexLock mutex(mutexHandler);
-  if (!mutex.hasMutex()) {
+  ReadLock lock(&mutex_, true, 5000);
+  if (!lock.IsLocked()) {
     NSC_LOG_ERROR(_T("Failed to get Mutex!"));
     return -1;
   }
-  return static_cast<int>(cpu.getAvrage(mseconds / (checkIntervall_*100)));
+  try {
+    return static_cast<int>(cpu.getAvrage(mseconds / (checkIntervall_*100)));
+  } catch (PDHCollectors::PDHException &e) {
+    NSC_LOG_ERROR(_T("Failed to get (sub) Mutex!"));
+    return -1;
+  }
 }
 /**
@@ -261 +271 @@
 */
 long long PDHCollector::getUptime() {
-  MutexLock mutex(mutexHandler);
-  if (!mutex.hasMutex()) {
+  ReadLock lock(&mutex_, true, 5000);
+  if (!lock.IsLocked()) {
     NSC_LOG_ERROR(_T("Failed to get Mutex!"));
     return -1;
@@ -273 +283 @@
 */
 unsigned long long PDHCollector::getMemCommitLimit() {
-  MutexLock mutex(mutexHandler);
-  if (!mutex.hasMutex()) {
+  ReadLock lock(&mutex_, true, 5000);
+  if (!lock.IsLocked()) {
     NSC_LOG_ERROR(_T("Failed to get Mutex!"));
     return -1;
@@ -286 +296 @@
 */
 unsigned long long PDHCollector::getMemCommit() {
-  MutexLock mutex(mutexHandler);
-  if (!mutex.hasMutex()) {
+  ReadLock lock(&mutex_, true, 5000);
+  if (!lock.IsLocked()) {
     NSC_LOG_ERROR(_T("Failed to get Mutex!"));
     return -1;

modules/CheckSystem/PDHCollector.h

@@ -23 +23 @@
 #include "PDHCollectors.h"
 #include <thread.h>
-#include <Mutex.h>
+#include <MutexRW.h>
 
 /**
@@ -46 +46 @@
 class PDHCollector {
 private:
-  MutexHandler mutexHandler;
+
+  MutexRW mutex_;
   HANDLE hStopEvent_;
   int checkIntervall_;
 
-  PDHCollectors::StaticPDHCounterListener<unsigned __int64, PDHCollectors::format_large> memCmtLim;
-  PDHCollectors::StaticPDHCounterListener<unsigned __int64, PDHCollectors::format_large> memCmt;
-  PDHCollectors::StaticPDHCounterListener<__int64, PDHCollectors::format_large> upTime;
-  PDHCollectors::RoundINTPDHBufferListener<__int64, PDHCollectors::format_large> cpu;
+  PDHCollectors::StaticPDHCounterListener<unsigned __int64, PDHCollectors::format_large, PDHCollectors::PDHCounterNormalMutex> memCmtLim;
+  PDHCollectors::StaticPDHCounterListener<unsigned __int64, PDHCollectors::format_large, PDHCollectors::PDHCounterNormalMutex> memCmt;
+  PDHCollectors::StaticPDHCounterListener<__int64, PDHCollectors::format_large, PDHCollectors::PDHCounterNormalMutex> upTime;
+  PDHCollectors::RoundINTPDHBufferListener<__int64, PDHCollectors::format_large, PDHCollectors::PDHCounterNormalMutex> cpu;
 
 public:

modules/NRPEListener/NRPEListener-2005.vcproj

@@ -1401 +1401 @@
       </File>
       <File
-        RelativePath=".\NRPEPacket.cpp"
-        >
-      </File>
-      <File
         RelativePath="..\..\include\NSCHelper.cpp"
         >
@@ -2104 +2100 @@
       <File
         RelativePath=".\NRPEListener.h"
-        >
-      </File>
-      <File
-        RelativePath=".\NRPEPacket.h"
         >
       </File>

modules/NRPEListener/NRPEListener.cpp

@@ -24 +24 @@
 #include <time.h>
 #include <config.h>
-#include "NRPEPacket.h"
 #include <msvc_wrappers.h>
 
@@ -128 +127 @@
     return false;
   }
+  root_ = NSCModuleHelper::getBasePath();
 
   return true;
@@ -228 +228 @@
     return NSCModuleHelper::InjectSplitAndCommand(t.first, sTarget, '!', message, perf);
   } else if (cd.type == script) {
-    return executeNRPECommand(args, message, perf);
+    int result = process::executeProcess(root_, args, message, perf, timeout);
+    if (!NSCHelper::isNagiosReturnCode(result)) {
+      NSC_LOG_ERROR_STD(_T("The command (") + command.c_str() + _T(") returned an invalid return code: ") + strEx::itos(result));
+      return NSCAPI::returnUNKNOWN;
+    }
+    return NSCHelper::int2nagios(result);
   } else if (cd.type == script_dir) {
     std::wstring args = arrayBuffer::arrayBuffer2string(char_args, argLen, _T(" "));
     std::wstring cmd = scriptDirectory_ + command.c_str() + _T(" ") +args;
-    return executeNRPECommand(cmd, message, perf);
+    int result = process::executeProcess(root_, cmd, message, perf, timeout);
+    if (!NSCHelper::isNagiosReturnCode(result)) {
+      NSC_LOG_ERROR_STD(_T("The command (") + command.c_str() + _T(") returned an invalid return code: ") + strEx::itos(result));
+      return NSCAPI::returnUNKNOWN;
+    }
+    return NSCHelper::int2nagios(result);
   } else {
     NSC_LOG_ERROR_STD(_T("Unknown script type: ") + command.c_str());
@@ -239 +249 @@
 
 }
-int NRPEListener::executeNRPECommand(std::wstring command, std::wstring &msg, std::wstring &perf)
-{
-  NSCAPI::nagiosReturn result;
-  PROCESS_INFORMATION pi;
-  STARTUPINFO si;
-  HANDLE hChildOutR, hChildOutW, hChildInR, hChildInW;
-  SECURITY_ATTRIBUTES sec;
-  DWORD dwstate, dwexitcode;
-  int retval;
-
-
-  // Set up members of SECURITY_ATTRIBUTES structure. 
-
-  sec.nLength = sizeof(SECURITY_ATTRIBUTES);
-  sec.bInheritHandle = TRUE;
-  sec.lpSecurityDescriptor = NULL;
-
-  // Create Pipes
-  CreatePipe(&hChildInR, &hChildInW, &sec, 0);
-  CreatePipe(&hChildOutR, &hChildOutW, &sec, 0);
-
-  // Set up members of STARTUPINFO structure. 
-
-  ZeroMemory(&si, sizeof(STARTUPINFO));
-  si.cb = sizeof(STARTUPINFO);
-  si.dwFlags = STARTF_USESTDHANDLES|STARTF_USESHOWWINDOW;
-  si.hStdInput = hChildInR;
-  si.hStdOutput = hChildOutW;
-  si.hStdError = hChildOutW;
-  si.wShowWindow = SW_HIDE;
-
-
-  // CreateProcess doesn't work with a const command
-  TCHAR *cmd = new TCHAR[command.length()+1];
-  wcsncpy_s(cmd, command.length()+1, command.c_str(), command.length());
-  cmd[command.length()] = 0;
-  std::wstring root = NSCModuleHelper::getBasePath();
-
-  // Create the child process. 
-  BOOL processOK = CreateProcess(NULL, cmd,        // command line 
-    NULL, // process security attributes 
-    NULL, // primary thread security attributes 
-    TRUE, // handles are inherited 
-    0,    // creation flags 
-    NULL, // use parent's environment 
-    root.c_str(), // use parent's current directory 
-    &si,  // STARTUPINFO pointer 
-    &pi); // receives PROCESS_INFORMATION 
-  delete [] cmd;
-
-  if (processOK) {
-    dwstate = WaitForSingleObject(pi.hProcess, 1000*timeout);
-    CloseHandle(hChildInR);
-    CloseHandle(hChildInW);
-    CloseHandle(hChildOutW);
-
-    if (dwstate == WAIT_TIMEOUT) {
-      TerminateProcess(pi.hProcess, 5);
-      msg = _T("The check (") + command + _T(") didn't respond within the timeout period (") + strEx::itos(timeout) + _T("s)!");
-      result = NSCAPI::returnUNKNOWN;
-    } else {
-      DWORD dwread;
-      std::string str;
-#define BUFF_SIZE 4096
-      char *buf = new char[BUFF_SIZE+1];
-      do {
-        retval = ReadFile(hChildOutR, buf, BUFF_SIZE, &dwread, NULL);
-        if (retval == 0)
-          break;
-        if (dwread > BUFF_SIZE)
-          break;
-        buf[dwread] = 0;
-        str += buf;
-      } while (dwread == BUFF_SIZE);
-      delete [] buf;
-      if (str.empty()) {
-        msg = _T("No output available from command...");
-      } else {
-        msg = strEx::string_to_wstring(str);
-        strEx::token t = strEx::getToken(msg, '|');
-        msg = t.first;
-        std::wstring::size_type pos = msg.find_last_not_of(_T("\n\r "));
-        if (pos != std::wstring::npos) {
-          if (pos == msg.size())
-            msg = msg.substr(0,pos);
-          else
-            msg = msg.substr(0,pos+1);
-        }
-        perf = t.second;
-      }
-      if (GetExitCodeProcess(pi.hProcess, &dwexitcode) == 0) {
-        NSC_LOG_ERROR(_T("Failed to get commands (") + command + _T(") return code: ") + error::lookup::last_error());
-        dwexitcode = NSCAPI::returnUNKNOWN;
-      }
-      if (!NSCHelper::isNagiosReturnCode(dwexitcode)) {
-        NSC_LOG_ERROR(_T("The command (") + command + _T(") returned an invalid return code: ") + strEx::itos(dwexitcode));
-        dwexitcode = NSCAPI::returnUNKNOWN;
-      }
-      result = NSCHelper::int2nagios(dwexitcode);
-    }
-    CloseHandle(pi.hThread);
-    CloseHandle(pi.hProcess);
-    CloseHandle(hChildOutR);
-  }
-  else {
-    msg = _T("NRPE_NT failed to create process (") + command + _T("): ") + error::lookup::last_error();
-    result = NSCAPI::returnUNKNOWN;
-    CloseHandle(hChildInR);
-    CloseHandle(hChildInW);
-    CloseHandle(hChildOutW);
-    CloseHandle(pi.hThread);
-    CloseHandle(pi.hProcess);
-    CloseHandle(hChildOutR);
-  }
-  return result;
-}
+
 void NRPEListener::onClose()
 {}
@@ -400 +295 @@
         return;
       }
-      client->send(block);
+      int maxWait = socketTimeout_*10;
+      for (i=0;i<maxWait;i++) {
+        bool lastReadHasMore = false;
+        try {
+          if (client->canWrite())
+            lastReadHasMore = client->sendAll(block);
+        } catch (simpleSocket::SocketException e) {
+          NSC_LOG_MESSAGE(_T("Could not send NRPE packet from socket :") + e.getMessage());
+          client->close();
+          return;
+        }
+        if (!lastReadHasMore) {
+          client->close();
+          return;
+        }
+        Sleep(100);
+      }
+      if (i >= maxWait) {
+        NSC_LOG_ERROR_STD(_T("Timeout reading NRPE-packet (increase socket_timeout)"));
+        client->close();
+        return;
+      }
     }
   } catch (simpleSocket::SocketException e) {
@@ -406 +322 @@
   } catch (NRPEException e) {
     NSC_LOG_ERROR_STD(_T("NRPEException: ") + e.getMessage());
+  } catch (...) {
+    NSC_LOG_ERROR_STD(_T("Unhandled Exception in NRPE listner..."));
   }
   client->close();
@@ -413 +331 @@
   if (p.getType() != NRPEPacket::queryPacket) {
     NSC_LOG_ERROR(_T("Request is not a query."));
-    throw NRPEException(_T("Invalid query type"));
+    throw NRPEException(_T("Invalid query type: ") + strEx::itos(p.getType()));
   }
   if (p.getVersion() != NRPEPacket::version2) {
@@ -470 +388 @@
       ret = NSCAPI::returnUNKNOWN;
   }
-  if (msg.length() > buffer_length_) {
+  if (msg.length() >= buffer_length_) {
     NSC_LOG_ERROR(_T("Truncating returndata as it is bigger then NRPE allowes :("));
     msg = msg.substr(0,buffer_length_-1);

modules/NRPEListener/NRPEListener.h

@@ -24 +24 @@
 #include <SSLSocket.h>
 #include <map>
-#include "NRPEPacket.h"
+#include <nrpe/NRPEPacket.hpp>
+#include <execute_process.hpp>
 
 class NRPEListener : public simpleSocket::ListenerHandler {
@@ -48 +49 @@
   std::wstring scriptDirectory_;
   unsigned int buffer_length_;
+  std::wstring root_;
 
 public:

modules/NSCAAgent/NSCAAgent.cpp

@@ -45 +45 @@
  * @return 
  */
-NSCAAgent::NSCAAgent() : pdhThread(_T("NSCAThread")) {}
+NSCAAgent::NSCAAgent() {}
 /**
  * Default d-tor
@@ -57 +57 @@
  */
 bool NSCAAgent::loadModule() {
-  pdhThread.createThread();
-  std::list<std::wstring> checks = NSCModuleHelper::getSettingsSection(NSCA_CMD_SECTION_TITLE);
-  int interval = NSCModuleHelper::getSettingsInt(NSCA_AGENT_SECTION_TITLE, NSCA_INTERVAL, NSCA_INTERVAL_DEFAULT);
+  //pdhThread.createThread();
+  //std::list<std::wstring> checks = NSCModuleHelper::getSettingsSection(NSCA_CMD_SECTION_TITLE);
+  //int interval = NSCModuleHelper::getSettingsInt(NSCA_AGENT_SECTION_TITLE, NSCA_INTERVAL, NSCA_INTERVAL_DEFAULT);
+  int e_threads = NSCModuleHelper::getSettingsInt(NSCA_AGENT_SECTION_TITLE, NSCA_DEBUG_THREADS, NSCA_DEBUG_THREADS_DEFAULT);
+
+  for (int i=1;i<e_threads;i++) {
+    std::wstring id = _T("nsca_t_") + strEx::itos(i);
+    NSCAThreadImpl *thread = new NSCAThreadImpl(id);
+    extra_threads.push_back(thread);
+  }
+  for (std::list<NSCAThreadImpl*>::const_iterator cit=extra_threads.begin();cit != extra_threads.end(); ++cit) {
+    (*cit)->createThread(reinterpret_cast<LPVOID>(rand()));
+  }
   
   return true;
@@ -69 +79 @@
  */
 bool NSCAAgent::unloadModule() {
+  /*
   if (!pdhThread.exitThread(20000)) {
     std::wcout << _T("MAJOR ERROR: Could not unload thread...") << std::endl;
     NSC_LOG_ERROR(_T("Could not exit the thread, memory leak and potential corruption may be the result..."));
+  }
+  */
+  for (std::list<NSCAThreadImpl*>::iterator it=extra_threads.begin();it != extra_threads.end(); ++it) {
+    if (!(*it)->exitThread(20000)) {
+      std::wcout << _T("MAJOR ERROR: Could not unload thread...") << std::endl;
+      NSC_LOG_ERROR(_T("Could not exit the thread, memory leak and potential corruption may be the result..."));
+    }
   }
   return true;

modules/NSCAAgent/NSCAAgent.h

@@ -31 +31 @@
   CheckMemory memoryChecker;
   int processMethod_;
-  NSCAThreadImpl pdhThread;
+//  NSCAThreadImpl pdhThread;
+  std::list<NSCAThreadImpl*> extra_threads;
 
 public:

modules/NSCAAgent/NSCAThread.cpp

@@ -60 +60 @@
   NSCAPI::nagiosReturn ret = NSCModuleHelper::InjectCommand(cmd_.c_str(), args_.getLen(), args_.get(), msg, perf);
   result.service = alias_;
-  result.code = conv_code(ret);
   if (ret == NSCAPI::returnIgnored) {
     result.result = _T("Command was not found: ") + cmd_;
+    result.code = NSCAPI::returnUNKNOWN;
   } else if (ret == NSCAPI::returnInvalidBufferLen) {
     result.result = _T("Result was to long: ") + cmd_;
+    result.code = NSCAPI::returnUNKNOWN;
   } else {
     result.result = msg + _T("|") + perf;
+    result.code = conv_code(ret);
     if (result.result.length() >= NSCA_MAX_PLUGINOUTPUT_LENGTH) {
       NSC_LOG_ERROR(_T("NSCA return data truncated"));
@@ -72 +74 @@
     }
   }
-  NSC_LOG_MESSAGE_STD(_T("Result: ") + result.toString());
+  //NSC_DEBUG_MSG_STD(_T("Result: ") + result.toString());
   return result;
 }
@@ -107 +109 @@
   }
 
+  srand( reinterpret_cast<int>(lpParameter) );
+
   DWORD waitStatus = 0;
+  int drift = (checkIntervall_*rand())/RAND_MAX ;
+  NSC_LOG_ERROR_STD(_T("Drifting: ") + strEx::itos(drift));
+  waitStatus = WaitForSingleObject(hStopEvent_, drift*1000);
+  if (waitStatus != WAIT_TIMEOUT)  {
+    NSC_LOG_ERROR_STD(_T("Drift failed... strange..."));
+  }
+  NSC_LOG_ERROR_STD(_T("Done drifting: ") + strEx::itos(drift));
   int remain = checkIntervall_;
   while (((waitStatus = WaitForSingleObject(hStopEvent_, remain*1000)) == WAIT_TIMEOUT)) {

modules/NSCAAgent/nsca_enrypt.hpp

@@ -92 +92 @@
       /* generate an encryption/description key using the password */
       int keysize=get_keySize();
-      std::cout << "keysize: " << keysize << std::endl;
 
       unsigned char *key = new unsigned char[keysize+1];