Changeset 5d8e0b5 in nscp

Timestamp:

04/19/05 00:50:16 (8 years ago)

Author:

Michael Medin <michael@…>

Children:

ae192e3

Parents:

ce6eabf

Message:

MAJOR CHANGES
2004-04-19 MickeM

+ Added SSL support
+ Added alot of new options
+ Added documentation

• Renamed and restructured NSCLientCompat to CheckSystem
• *ALOT* of fixes all over : We are now starting to get to something that is "stable" : This means that soon you might actually be able to use this.

Location:

trunk

Files:

• NSCPlugin.cpp (modified) (2 diffs)
• NSCPlugin.h (modified) (3 diffs)
• NSClient++.cpp (modified) (9 diffs)
• NSClient++.h (modified) (3 diffs)
• NSClient++.sln (modified) (6 diffs)
• NSClient++.vcproj (modified) (6 diffs)
• StdAfx.h (modified) (1 diff)
• changelog (modified) (1 diff)
• dist_dll/placeholder.txt (modified) (1 diff)
• include/NSCHelper.h (modified) (2 diffs)
• include/PDHCollectors.h (modified) (4 diffs)
• include/SSLSocket.cpp (added)
• include/SSLSocket.h (added)
• include/Socket.cpp (modified) (4 diffs)
• include/Socket.h (modified) (5 diffs)
• include/config.h (modified) (4 diffs)
• include/strEx.h (modified) (4 diffs)
• include/thread.h (modified) (8 diffs)
• include/utils.cpp (added)
• include/utils.h (added)
• modules/CheckDisk/CheckDisk.cpp (modified) (4 diffs)
• modules/CheckDisk/CheckDisk.h (modified) (1 diff)
• modules/CheckDisk/CheckDisk.vcproj (modified) (6 diffs)
• modules/CheckSystem/CheckSystem.cpp (added)
• modules/CheckSystem/CheckSystem.def (added)
• modules/CheckSystem/CheckSystem.h (added)
• modules/CheckSystem/CheckSystem.vcproj (added)
• modules/CheckSystem/PDHCollector.cpp (added)
• modules/CheckSystem/PDHCollector.h (added)
• modules/CheckSystem/stdafx.cpp (added)
• modules/CheckSystem/stdafx.h (added)
• modules/FileLogger/FileLogger.cpp (modified) (2 diffs)
• modules/FileLogger/FileLogger.vcproj (modified) (1 diff)
• modules/FileLogger/stdafx.h (modified) (1 diff)
• modules/NRPEListener/NRPEListener.cpp (modified) (6 diffs)
• modules/NRPEListener/NRPEListener.h (modified) (2 diffs)
• modules/NRPEListener/NRPEListener.vcproj (modified) (8 diffs)
• modules/NRPEListener/NRPEPacket.cpp (added)
• modules/NRPEListener/NRPEPacket.h (added)
• modules/NRPEListener/NRPESocket.cpp (modified) (1 diff)
• modules/NRPEListener/NRPESocket.h (modified) (2 diffs)
• modules/NRPEListener/stdafx.h (modified) (1 diff)
• modules/NSClientCompat/NSClientCompat.vcproj (modified) (1 diff)
• modules/NSClientListener/NSClientListener.cpp (modified) (4 diffs)
• modules/NSClientListener/NSClientListener.h (modified) (2 diffs)
• modules/NSClientListener/NSClientListener.vcproj (modified) (3 diffs)
• modules/SysTray/SysTray.vcproj (modified) (1 diff)
• readme.html (added)

trunk/NSCPlugin.cpp

@@ -10 +10 @@
 NSCPlugin::NSCPlugin(const std::string file)
   : file_(file)
+  ,hModule_(NULL)
   ,fLoadModule(NULL)
   ,fGetName(NULL)
@@ -18 +19 @@
   ,bLoaded_(false)
 {
+}
+
+NSCPlugin::NSCPlugin(NSCPlugin &other)
+  :hModule_(NULL)
+  ,fLoadModule(NULL)
+  ,fGetName(NULL)
+  ,fHasCommandHandler(NULL)
+  ,fUnLoadModule(NULL)
+  ,fHasMessageHandler(NULL)
+  ,fHandleMessage(NULL)
+  ,bLoaded_(false)
+{
+  if (other.bLoaded_) {
+    file_ = other.file_;
+    hModule_ = LoadLibrary(file_.c_str());
+    if (!hModule_)
+      throw NSPluginException(file_, "Could not load library: ", GetLastError());
+    loadRemoteProcs_();
+    if (!fLoadModule)
+      throw NSPluginException(file_, "Critical error (fLoadModule)");
+    bLoaded_ = other.bLoaded_;
+  }
 }
 

trunk/NSCPlugin.h

@@ -88 +88 @@
   std::string file_;    // Name of the DLL file
 
-  typedef int (*lpModuleHelperInit)(NSCModuleHelper::lpNSAPILoader f);
-  typedef int (*lpLoadModule)();
+  typedef INT (*lpModuleHelperInit)(NSCModuleHelper::lpNSAPILoader f);
+  typedef INT (*lpLoadModule)();
   typedef INT (*lpGetName)(char*,unsigned int);
   typedef INT (*lpHasCommandHandler)();
@@ -95 +95 @@
   typedef NSCAPI::nagiosReturn (*lpHandleCommand)(const char*,const unsigned int, char**,char*,unsigned int,char *,unsigned int);
   typedef INT (*lpHandleMessage)(int,const char*,const int,const char*);
-  typedef int (*lpUnLoadModule)();
+  typedef INT (*lpUnLoadModule)();
 
   lpModuleHelperInit fModuleHelperInit;
@@ -108 +108 @@
 public:
   NSCPlugin(const std::string file);
+  NSCPlugin(NSCPlugin &other);
   virtual ~NSCPlugin(void);
 

trunk/NSClient++.cpp

@@ -82 +82 @@
       std::cin >> s;
       while (s != "exit") {
-//        mainClient.inject(s);
+        strEx::token t = strEx::getToken(s, ',');
+        std::string msg, perf;
+        NSCAPI::nagiosReturn ret = mainClient.inject(t.first, t.second, ',', msg, perf);
+        if (perf.empty())
+          std::cout << NSCHelper::translateReturn(ret) << ":" << msg << std::endl;
+        else
+          std::cout << NSCHelper::translateReturn(ret) << ":" << msg << "|" << perf << std::endl;
         std::cin >> s;
       }
@@ -109 +115 @@
 
   try {
-    simpleSocket::Socket::WSAStartup();
+    simpleSocket::WSAStartup();
   } catch (simpleSocket::SocketException e) {
     LOG_ERROR_STD("Uncaught exception: " + e.getMessage());
@@ -136 +142 @@
   }
   try {
-    simpleSocket::Socket::WSACleanup();
+    simpleSocket::WSACleanup();
   } catch (simpleSocket::SocketException e) {
     LOG_ERROR_STD("Uncaught exception: " + e.getMessage());
@@ -187 +193 @@
     return;
   }
-  pluginList::reverse_iterator it;
-  for (it = plugins_.rbegin(); it != plugins_.rend(); ++it) {
-    LOG_DEBUG_STD("Unloading plugin: " + (*it)->getName() + "...");
-    (*it)->unload();
-  }
+  commandHandlers_.clear();
   {
     MutexLock lock2(messageMutex,20000);
@@ -200 +202 @@
     }
   }
-  commandHandlers_.clear();
-  for (it = plugins_.rbegin(); it != plugins_.rend(); ++it) {
-    delete (*it);
+  for (pluginList::size_type i=plugins_.size();i>0;i--) {
+    NSCPlugin *p = plugins_[i-1];
+    LOG_DEBUG_STD("Unloading plugin: " + p->getName() + "...");
+    p->unload();
+  }
+
+  for (unsigned int i=plugins_.size();i>0;i--) {
+    NSCPlugin *p = plugins_[i-1];
+    plugins_[i-1] = NULL;
+    delete p;
   }
   plugins_.clear();
@@ -226 +235 @@
   LOG_DEBUG_STD("Loading: " + plugin->getName());
   // @todo Catch here and unload if we fail perhaps ?
-  plugins_.push_back(plugin);
+  plugins_.insert(plugins_.end(), plugin);
   if (plugin->hasCommandHandler())
-    commandHandlers_.push_back(plugin);
+    commandHandlers_.insert(commandHandlers_.end(), plugin);
   if (plugin->hasMessageHandler())
-    messageHandlers_.push_back(plugin);
-}
+    messageHandlers_.insert(messageHandlers_.end(), plugin);
+}
+
+NSCAPI::nagiosReturn NSClientT::inject(std::string command, std::string arguments, char splitter, std::string &msg, std::string & perf) {
+  unsigned int aLen = 0;
+  char ** aBuf = arrayBuffer::split2arrayBuffer(arguments, splitter, aLen);
+  char * mBuf = new char[1024];
+  char * pBuf = new char[1024];
+  NSCAPI::nagiosReturn ret = injectRAW(command.c_str(), aLen, aBuf, mBuf, 1023, pBuf, 1023);
+  arrayBuffer::destroyArrayBuffer(aBuf, aLen);
+  if ( (ret == NSCAPI::returnInvalidBufferLen) || (ret == NSCAPI::returnIgnored) )
+    return ret;
+  msg = mBuf;
+  perf = pBuf;
+  delete [] mBuf;
+  delete [] pBuf;
+  return ret;
+}
+
 /**
  * Inject a command into the plug-in stack.
@@ -240 +266 @@
 NSCAPI::nagiosReturn NSClientT::injectRAW(const char* command, const unsigned int argLen, char **argument, char *returnMessageBuffer, unsigned int returnMessageBufferLen, char *returnPerfBuffer, unsigned int returnPerfBufferLen) {
   MutexLock lock(pluginMutex);
-
-  pluginList::const_iterator plit;
-  for (plit = commandHandlers_.begin(); plit != commandHandlers_.end(); ++plit) {
+  if (!lock.hasMutex()) {
+    LOG_ERROR("Failed to get mutex, command ignored...");
+  }
+
+  for (pluginList::size_type i = 0; i < commandHandlers_.size(); i++) {
     try {
-      NSCAPI::nagiosReturn c = (*plit)->handleCommand(command, argLen, argument, returnMessageBuffer, returnMessageBufferLen, returnPerfBuffer, returnPerfBufferLen);
+      NSCAPI::nagiosReturn c = commandHandlers_[i]->handleCommand(command, argLen, argument, returnMessageBuffer, returnMessageBufferLen, returnPerfBuffer, returnPerfBufferLen);
       switch (c) {
         case NSCAPI::returnInvalidBufferLen:
@@ -287 +315 @@
   }
   if (g_bConsoleLog) {
-    std::cout << NSCHelper::translateMessageType(msgType) << " " << file << "(" << line << ") " << message << std::endl;
+    std::string k = "?";
+    switch (msgType) {
+      case NSCAPI::critical:
+        k ="c";
+        break;
+      case NSCAPI::warning:
+        k ="w";
+        break;
+      case NSCAPI::error:
+        k ="e";
+        break;
+      case NSCAPI::log:
+        k ="l";
+        break;
+      case NSCAPI::debug:
+        k ="d";
+        break;
+    }
+    std::cout << k << " " << file << "(" << line << ") " << message << std::endl;
   }
   if (msgType == NSCAPI::debug) {
@@ -301 +347 @@
       return;
   }
-  pluginList::const_iterator plit;
-  for (plit = messageHandlers_.begin(); plit != messageHandlers_.end(); ++plit) {
+  for (pluginList::size_type i = 0; i< messageHandlers_.size(); i++) {
     try {
-      (*plit)->handleMessage(msgType, file, line, message.c_str());
+      messageHandlers_[i]->handleMessage(msgType, file, line, message.c_str());
     } catch(const NSPluginException& e) {
       // Here we are pretty much fucked! (as logging this might cause a loop :)

trunk/NSClient++.h

@@ -37 +37 @@
 private:
   typedef NSCPlugin* plugin_type;
-  typedef std::list<plugin_type> pluginList;
+  typedef std::vector<plugin_type> pluginList;
   pluginList plugins_;
   pluginList commandHandlers_;
@@ -59 +59 @@
   std::string getBasePath(void);
   NSCAPI::nagiosReturn injectRAW(const char* command, const unsigned int argLen, char **argument, char *returnMessageBuffer, unsigned int returnMessageBufferLen, char *returnPerfBuffer, unsigned int returnPerfBufferLen);
+  NSCAPI::nagiosReturn NSClientT::inject(std::string command, std::string arguments, char splitter, std::string &msg, std::string & perf);
 //  std::string inject(const std::string buffer);
   std::string execute(std::string password, std::string cmd, std::list<std::string> args);
@@ -105 +106 @@
 #define LOG_MESSAGE(msg) \
   NSAPIMessage(NSCAPI::log, __FILE__, __LINE__, msg)
+
 #define LOG_DEBUG_STD(msg) LOG_DEBUG(((std::string)msg).c_str())
 #define LOG_DEBUG(msg) \
   NSAPIMessage(NSCAPI::debug, __FILE__, __LINE__, msg)
+/*
+#define LOG_DEBUG_STD(msg)
+#define LOG_DEBUG(msg)
+*/

trunk/NSClient++.sln

@@ -5 +5 @@
     {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24}
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8}
-    {79F1F571-78A6-4B20-8BD5-0F65CD60012C} = {79F1F571-78A6-4B20-8BD5-0F65CD60012C}
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}
@@ -12 +11 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SysTray", "modules\SysTray\SysTray.vcproj", "{BBFF8362-C626-4838-B0A2-F695D638AD24}"
-  ProjectSection(ProjectDependencies) = postProject
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSClientCompat", "modules\NSClientCompat\NSClientCompat.vcproj", "{79F1F571-78A6-4B20-8BD5-0F65CD60012C}"
   ProjectSection(ProjectDependencies) = postProject
   EndProjectSection
@@ -36 +31 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NSClientListener", "modules\NSClientListener\NSClientListener.vcproj", "{08D6246D-1B4A-47A3-965D-296DCC54A4E8}"
+  ProjectSection(ProjectDependencies) = postProject
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckSystem", "modules\CheckSystem\CheckSystem.vcproj", "{2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}"
   ProjectSection(ProjectDependencies) = postProject
   EndProjectSection
@@ -61 +60 @@
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.Release.ActiveCfg = Release|Win32
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.Release.Build.0 = Release|Win32
-    {79F1F571-78A6-4B20-8BD5-0F65CD60012C}.Debug.ActiveCfg = Debug|Win32
-    {79F1F571-78A6-4B20-8BD5-0F65CD60012C}.Debug.Build.0 = Debug|Win32
-    {79F1F571-78A6-4B20-8BD5-0F65CD60012C}.Distribution.ActiveCfg = Distribution|Win32
-    {79F1F571-78A6-4B20-8BD5-0F65CD60012C}.Distribution.Build.0 = Distribution|Win32
-    {79F1F571-78A6-4B20-8BD5-0F65CD60012C}.Release.ActiveCfg = Release|Win32
-    {79F1F571-78A6-4B20-8BD5-0F65CD60012C}.Release.Build.0 = Release|Win32
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug.ActiveCfg = Debug|Win32
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug.Build.0 = Debug|Win32
@@ -79 +72 @@
     {BA246C01-063A-4548-8957-32D5CC76171B}.Release.ActiveCfg = Release|Win32
     {BA246C01-063A-4548-8957-32D5CC76171B}.Release.Build.0 = Release|Win32
-    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug.ActiveCfg = Debug Dynamic Linkage|Win32
-    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug.Build.0 = Debug Dynamic Linkage|Win32
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug.ActiveCfg = Debug|Win32
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug.Build.0 = Debug|Win32
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Distribution.ActiveCfg = Distribution|Win32
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Distribution.Build.0 = Distribution|Win32
-    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Release.ActiveCfg = Dynamic Linkage|Win32
-    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Release.Build.0 = Dynamic Linkage|Win32
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Release.ActiveCfg = Release|Win32
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Release.Build.0 = Release|Win32
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug.ActiveCfg = Debug|Win32
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug.Build.0 = Debug|Win32
@@ -97 +90 @@
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Release.ActiveCfg = Release|Win32
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Release.Build.0 = Release|Win32
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug.ActiveCfg = Debug|Win32
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug.Build.0 = Debug|Win32
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Distribution.ActiveCfg = Distribution|Win32
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Distribution.Build.0 = Distribution|Win32
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Release.ActiveCfg = Release|Win32
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Release.Build.0 = Release|Win32
   EndGlobalSection
   GlobalSection(ExtensibilityGlobals) = postSolution

trunk/NSClient++.vcproj

@@ -42 +42 @@
         Name="VCCustomBuildTool"
         CommandLine="echo Copying dependency DLLs
-cmd /c "copy $(InputDir)\dist_dll\*.* $(InputDir)\$(OutDir)\""
+cmd /c "copy $(InputDir)\dist_dll\*.* $(InputDir)\$(OutDir)\"
+"
         Outputs="$(InputDir)\$(OutDir)\msvcp71.dll"/>
       <Tool
@@ -173 +174 @@
       <Tool
         Name="VCCustomBuildTool"
-        CommandLine="echo Copying dependency DLLs
+        CommandLine="echo Copying documentation
+cmd /c &quot;copy $(InputDir)\*.html $(InputDir)\Dist\&quot;
+echo Copying dependency DLLs
 cmd /c &quot;copy $(InputDir)\dist_dll\*.dll $(InputDir)\Dist\&quot;
 echo Removing old archive
 cmd /c &quot;del $(InputDir)\Dist\$(InputName).zip&quot;
 echo Making archive
-7z.exe a -r -tzip -bd $(InputDir)\Dist\$(InputName).zip $(InputDir)\Dist\*"
+7z.exe a -r -tzip -bd $(InputDir)\Dist\$(InputName).zip $(InputDir)\Dist\*
+"
         Outputs="$(InputDir)\Dist\$(ProjectName).zip"/>
       <Tool
@@ -245 +249 @@
       </File>
       <File
+        RelativePath=".\include\Socket.cpp">
+      </File>
+      <File
         RelativePath="StdAfx.cpp">
         <FileConfiguration
@@ -327 +334 @@
             Name="VCCustomBuildTool"
             CommandLine="echo Copying $(InputFileName)...
-cmd /c &quot;copy $(InputDir)\$(InputName) $(InputDir)\Dist\&quot;"
+cmd /c &quot;copy $(InputDir)\$(InputName) $(InputDir)\Dist\&quot;
+"
             Outputs="$(InputDir)\Dist\$(InputFileName)"/>
         </FileConfiguration>
@@ -389 +397 @@
             Name="VCCustomBuildTool"
             CommandLine="echo Copying $(InputFileName)...
-cmd /c &quot;copy $(InputDir)\$(InputFileName) $(InputDir)\Dist\&quot;"
+cmd /c &quot;copy $(InputDir)\$(InputFileName) $(InputDir)\Dist\&quot;
+"
             AdditionalDependencies=""
             Outputs="$(InputDir)\Dist\$(InputFileName)"/>
@@ -415 +424 @@
             Name="VCCustomBuildTool"
             CommandLine="echo Copying $(InputFileName)...
-cmd /c &quot;copy $(InputDir)\$(InputFileName) $(InputDir)\Dist\&quot;"
+cmd /c &quot;copy $(InputDir)\$(InputFileName) $(InputDir)\Dist\&quot;
+"
             Outputs="$(InputDir)\Dist\$(InputFileName)"/>
         </FileConfiguration>

trunk/StdAfx.h

@@ -21 +21 @@
 #include <list>
 #include <sstream>
+#include <vector>
 
 #include "config.h"

trunk/changelog

@@ +1 @@
+2004-04-19 MickeM
+ + Added SSL support
+ + Added alot of new options
+ + Added documentation
+ * Renamed and restructured NSCLientCompat to CheckSystem
+ * *ALOT* of fixes all over
+ : We are now starting to get to something that is "stable"
+ : This means that soon you might actually be able to use this.
+ 
 2005-03-28 MickeM
  * Changed the Thread class a bit (mutex -> signal, and CreatThread does not return the instance)

trunk/dist_dll/placeholder.txt

@@ -2 +2 @@
 I have the following in my directory:
 
-boost_regex-vc71-mt-p-1_32.dll  - Only needed if you want to compile the CheckEventLog module
+boost_regex-vc71-mt-p-1_32.dll  - Only needed if you want to use the CheckEventLog module
 msvcp71.dll     - Regular MS VC++ 7.1 runtimes
 msvcr71.dll     - Regular MS VC++ 7.1 runtimes
 stlport_vc7146.dll    - STL port runtimes
+libeay32.dll      - SSL
+ssleay32.dll      - SSL

trunk/include/NSCHelper.h

@@ -19 +19 @@
   std::string translateReturn(NSCAPI::nagiosReturn returnCode);
   NSCAPI::nagiosReturn maxState(NSCAPI::nagiosReturn a, NSCAPI::nagiosReturn b);
+
+  inline bool isNagiosReturnCode(NSCAPI::nagiosReturn code) {
+    if ( (code == NSCAPI::returnOK) || (code == NSCAPI::returnWARN) || (code == NSCAPI::returnCRIT) || (code == NSCAPI::returnUNKNOWN) )
+      return true;
+    return false;
+  }
 
 #ifdef DEBUG
@@ -159 +165 @@
   NSCModuleHelper::Message(NSCAPI::debug, __FILE__, __LINE__, msg)
 
+/*
+#define NSC_DEBUG_MSG_STD(msg)
+#define NSC_DEBUG_MSG(msg)
+*/
 //////////////////////////////////////////////////////////////////////////
 // Message wrappers below this point

trunk/include/PDHCollectors.h

@@ -26 +26 @@
     unsigned int current;
   public:
+    RoundINTPDHBufferListener() : buffer(NULL), length(0), current(0) {}
     RoundINTPDHBufferListener(int length_) : length(length_), current(0) {
       buffer = new int[length];
@@ -34 +35 @@
       delete [] buffer;
     }
+    
+    /**
+     * Resize the buffer to a new length
+     *
+     * @todo Make this copy the old buffer if there is one.
+     *
+     * @param newLength The new length
+     */
+    void resize(int newLength) {
+      delete [] buffer;
+
+      current = 0;
+      length = newLength;
+
+      buffer = new int[length];
+      for (unsigned int i=0; i<length;i++)
+        buffer[i] = 0;
+        
+    }
     virtual void collect(const PDH::PDHCounter &counter) {
       pushValue(static_cast<int>(counter.getInt64Value()));
@@ -40 +60 @@
     void detach(const PDH::PDHCounter &counter){}
     void pushValue(int value) {
+      if (buffer == NULL)
+        return;
+      if (current >= length)
+        return;
       buffer[current++] = value;
       if (current >= length)
@@ -61 +85 @@
       return static_cast<int>(ret/backItems);
     }
+    inline unsigned int getLength() const {
+      return length;
+    }
   };
 

trunk/include/Socket.cpp

@@ -1 +1 @@
 #include "stdafx.h"
 #include <Socket.h>
-
-
-simpleSocket::Listener::~Listener() {
-  // @todo: Force cleanup here
-}
+#include <NSCHelper.h>
 
 
@@ -14 +10 @@
 * @todo This needs to be reworked, possibly completely redone ?
 */
-DWORD simpleSocket::Listener::ListenerThread::threadProc(LPVOID lpParameter)
-{
-  unsigned long NoBlock = 1;
-  Listener *core = reinterpret_cast<Listener*>(lpParameter);
 
-  hStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-  if (!hStopEvent) {
-    NSC_LOG_ERROR_STD("Create StopEvent failed: " + strEx::itos(GetLastError()));
-    return 0;
-  }
 
-  try {
-    core->socket(AF_INET,SOCK_STREAM,0);
-    core->setAddr(AF_INET, INADDR_ANY, htons(core->port_));
-    core->bind();
-    core->listen(10);
-    core->ioctlsocket(FIONBIO, &NoBlock);
-    while (!(WaitForSingleObject(hStopEvent, 100) == WAIT_OBJECT_0)) {
-      Socket client;
-      if (core->accept(client))
-        core->onAccept(client);
-    }
-  } catch (SocketException e) {
-    NSC_LOG_ERROR_STD(e.getMessage());
-  }
-  HANDLE hTmp = hStopEvent;
-  hStopEvent = NULL;
-  BOOL b = CloseHandle(hTmp);
-  assert(b);
-  return 0;
+void simpleSocket::Socket::printError(std::string error) {
+  NSC_LOG_ERROR_STD(error);
 }
 
-/**
-* Exit thread callback proc. 
-* This is called by the thread manager when the thread should initiate a shutdown procedure.
-* The thread manager is responsible for waiting for the actual termination of the thread.
-*/
-void simpleSocket::Listener::ListenerThread::exitThread(void) {
-  assert(hStopEvent);
-  if (!SetEvent(hStopEvent)) {
-    NSC_LOG_ERROR_STD("SetStopEvent failed");
-  }
-}
 
 void simpleSocket::Socket::readAll(DataBuffer &buffer, unsigned int tmpBufferLength /* = 1024*/) {
@@ -63 +22 @@
   char *tmpBuffer = new char[tmpBufferLength+1];
   int n=recv(socket_,tmpBuffer,tmpBufferLength,0);
-  while ((n!=SOCKET_ERROR )||(n!=0)) {
+  while ((n!=SOCKET_ERROR )&&(n!=0)) {
     if (n == tmpBufferLength) {
       // We filled the buffer (There is more to get)
@@ -78 +37 @@
 }
 
-void simpleSocket::Listener::StartListen(int port) {
-  port_ = port;
-  threadManager_.createThread(this);
+
+WSADATA simpleSocket::WSAStartup(WORD wVersionRequested /* = 0x202 */) {
+  WSADATA wsaData;
+  int wsaret=::WSAStartup(wVersionRequested,&wsaData);
+  if(wsaret != 0)
+    throw SocketException("WSAStartup failed: " + strEx::itos(wsaret));
+  return wsaData;
 }
-void simpleSocket::Listener::close() {
-  if (threadManager_.hasActiveThread())
-    if (!threadManager_.exitThread())
-      throw new SocketException("Could not terminate thread.");
-  Socket::close();
+void simpleSocket::WSACleanup() {
+  if (::WSACleanup() != 0)
+    throw SocketException("WSACleanup failed: ", ::WSAGetLastError());
 }
-
-
-
-

trunk/include/Socket.h

@@ -49 +49 @@
       return length_;
     }
+    void copyFrom(const char* buffer, const unsigned int length) {
+      delete [] buffer_;
+      buffer_ = new char[length+1];
+      memcpy(buffer_, buffer, length);
+    }
   };
 
   class Socket {
-  private:
+  protected:
     SOCKET socket_;
     sockaddr_in from_;
 
   public:
-    Socket() : socket_(NULL) {
-    }
-    Socket(SOCKET socket) : socket_(socket) {
-    }
+    Socket() : socket_(NULL) {}
+    Socket(SOCKET socket) : socket_(socket) {}
     Socket(Socket &other) {
       socket_ = other.socket_;
@@ -71 +74 @@
       socket_ = NULL;
     }
-    SOCKET getSocket() const {
-      return socket_;
-    }
+    virtual SOCKET detach() {
+      SOCKET s = socket_;
+      socket_ = NULL;
+      return s;
+    }
+    virtual void attach(SOCKET s) {
+      assert(socket_ == NULL);
+      socket_ = s;
+    }
+    virtual void shutdown(int how = SD_BOTH) {
+      if (socket_)
+        ::shutdown(socket_, how);
+    }
+
     virtual void close() {
       if (socket_)
@@ -79 +93 @@
       socket_ = NULL;
     }
-    void readAll(DataBuffer &buffer, unsigned int tmpBufferLength = 1024);
-
-    void socket(int af, int type, int protocol ) {
+    virtual void setNonBlock() {
+      unsigned long NoBlock = 1;
+      this->ioctlsocket(FIONBIO, &NoBlock);
+    }
+    virtual void readAll(DataBuffer &buffer, unsigned int tmpBufferLength = 1024);
+
+    virtual void socket(int af, int type, int protocol ) {
       socket_ = ::socket(af, type, protocol);
       assert(socket_ != INVALID_SOCKET);
     }
-    void bind() {
+    virtual void bind() {
+      assert(socket_);
       int fromlen=sizeof(from_);
       if (::bind(socket_, (sockaddr*)&from_, fromlen) == SOCKET_ERROR)
         throw SocketException("bind failed: ", ::WSAGetLastError());
     }
-    void listen(int backlog = 0) {
+    virtual void listen(int backlog = 0) {
+      assert(socket_);
       if (::listen(socket_, backlog) == SOCKET_ERROR)
         throw SocketException("listen failed: ", ::WSAGetLastError());
     }
-    bool accept(Socket &client) {
+    virtual bool accept(Socket &client) {
       int fromlen=sizeof(client.from_);
-      client.socket_ = ::accept(socket_, (sockaddr*)&client.from_, &fromlen);
-      if(client.socket_ == INVALID_SOCKET) {
+      SOCKET s = ::accept(socket_, (sockaddr*)&client.from_, &fromlen);
+      if(s == INVALID_SOCKET) {
         int err = ::WSAGetLastError();
         if (err == WSAEWOULDBLOCK)
@@ -103 +123 @@
         throw SocketException("accept failed: ", ::WSAGetLastError());
       }
+      client.attach(s);
       return true;
     }
-    void setAddr(short family, u_long addr, u_short port) {
+    virtual void setAddr(short family, u_long addr, u_short port) {
       from_.sin_family=family;
       from_.sin_addr.s_addr=addr;
       from_.sin_port=port;
     }
-    int send(const char * buf, unsigned int len, int flags ) {
+    virtual int send(const char * buf, unsigned int len, int flags = 0) {
+      assert(socket_);
       return ::send(socket_, buf, len, flags);
     }
-    void ioctlsocket(long cmd, u_long *argp) {
+    int inline send(DataBuffer &buffer, int flags = 0) {
+      return send(buffer.getBuffer(), buffer.getLength(), flags);
+    }
+    virtual void ioctlsocket(long cmd, u_long *argp) {
+      assert(socket_);
       if (::ioctlsocket(socket_, cmd, argp) == SOCKET_ERROR)
         throw SocketException("ioctlsocket failed: ", ::WSAGetLastError());
     }
-    std::string getAddrString() {
+    virtual std::string getAddrString() {
       return inet_ntoa(from_.sin_addr);
     }
-
-    static WSADATA WSAStartup(WORD wVersionRequested = 0x202) {
-      WSADATA wsaData;
-      int wsaret=::WSAStartup(wVersionRequested,&wsaData);
-      if(wsaret != 0)
-        throw SocketException("WSAStartup failed: " + strEx::itos(wsaret));
-      return wsaData;
-    }
-    static void WSACleanup() {
-      if (::WSACleanup() != 0)
-        throw SocketException("WSACleanup failed: ", ::WSAGetLastError());
-    }
-
-
-
+    virtual void printError(std::string error);
+  };
+
+  class ListenerHandler {
+  public:
+    virtual void onAccept(Socket &client) = 0;
+    virtual void onClose() = 0;
   };
 
@@ -162 +180 @@
    *
    */
-  class Listener : public Socket {
+  template <class TListenerType = simpleSocket::Socket, class TSocketType = TListenerType>
+  class Listener : public TListenerType {
+  public:
+    typedef TListenerType tListener;
+    typedef TSocketType tSocket;
+  private:
+    typedef TListenerType tBase;
+    class ListenerThread;
+    typedef Thread<ListenerThread> listenThreadManager;
+
+    u_short port_;
+    listenThreadManager threadManager_;
+
   public:
     class ListenerThread {
     private:
-      HANDLE hStopEvent;
+      typedef TListenerType tParentBase;
+      typedef TSocketType tSocket;
+
+      HANDLE hStopEvent_;
     public:
-      ListenerThread() : hStopEvent(NULL) {
+      ListenerThread() : hStopEvent_(NULL) {}
+      DWORD threadProc(LPVOID lpParameter);
+      void exitThread(void) {
+        assert(hStopEvent_ != NULL);
+        if (!SetEvent(hStopEvent_))
+          throw new SocketException("SetEvent failed.");
       }
-      DWORD threadProc(LPVOID lpParameter);
-      void exitThread(void);
     };
-
-  private:
-    MutexHandler mutexHandler;
-    u_short port_;
-    typedef Thread<ListenerThread> listenThreadManager;
-    listenThreadManager threadManager_;
-
-  public:
-    Listener() {};
-    virtual ~Listener();
-
-    void StartListen(int port);
-    virtual void close();
-
-  private:
-    virtual void onAccept(Socket client) = 0;
-
-  };
+  private:
+    ListenerHandler *pHandler_;
+
+  public:
+    Listener() : pHandler_(NULL) {};
+    virtual ~Listener() {};
+
+    virtual void StartListener(int port) {
+      port_ = port;
+      threadManager_.createThread(this);
+    }
+    virtual void StopListener() {
+      if (threadManager_.hasActiveThread())
+        if (!threadManager_.exitThread())
+          throw new SocketException("Could not terminate thread.");
+      tBase::close();
+    }
+    void setHandler(ListenerHandler* pHandler) {
+      pHandler_ = pHandler;
+    }
+    void removeHandler(ListenerHandler* pHandler) {
+      if (pHandler != pHandler_)
+        throw SocketException("Not a registered handler!");
+      pHandler_ = NULL;
+    }
+
+
+  private:
+    void onAccept(tSocket &client) {
+      if (pHandler_)
+        pHandler_->onAccept(client);
+    }
+    void onClose() {
+      if (pHandler_)
+        pHandler_->onClose();
+    }
+    virtual bool accept(tSocket &client) {
+      return tBase::accept(client);
+    }
+  };
+
+  WSADATA WSAStartup(WORD wVersionRequested = 0x202);
+  void WSACleanup();
+
 }
 
+template <class TListenerType, class TSocketType>
+DWORD simpleSocket::Listener<TListenerType, TSocketType>::ListenerThread::threadProc(LPVOID lpParameter)
+{
+  Listener *core = reinterpret_cast<Listener*>(lpParameter);
+
+  hStopEvent_ = CreateEvent(NULL, TRUE, FALSE, NULL);
+  if (!hStopEvent_) {
+    core->printError("Create StopEvent failed: " + strEx::itos(GetLastError()));
+    return 0;
+  }
+
+  try {
+    core->socket(AF_INET,SOCK_STREAM,0);
+    core->setAddr(AF_INET, INADDR_ANY, htons(core->port_));
+    core->bind();
+    core->listen(10);
+    core->setNonBlock();
+    while (!(WaitForSingleObject(hStopEvent_, 100) == WAIT_OBJECT_0)) {
+      try {
+        tSocket client;
+        if (core->accept(client))
+          core->onAccept(client);
+      } catch (SocketException e) {
+        core->printError(e.getMessage() + ", attempting to resume...");
+      }
+    }
+  } catch (SocketException e) {
+    core->printError(e.getMessage());
+  }
+  core->shutdown(SD_BOTH);
+  core->close();
+  core->onClose();
+  HANDLE hTmp = hStopEvent_;
+  hStopEvent_ = NULL;
+  if (!CloseHandle(hTmp)) {
+    core->printError("CloseHandle StopEvent failed: " + strEx::itos(GetLastError()));
+  }
+  return 0;
+}

trunk/include/config.h

@@ -1 @@
-
-
 #pragma once
 
@@ -7 +5 @@
 
 // Version
-#define SZVERSION "0.0.2 alfa 2005-03-27"
+#define SZVERSION "0.0.9 rc1 2005-04-19"
 
 // internal name of the service
@@ -21 +19 @@
 #define RECV_BUFFER_LEN   1024
 
-// The default NRPE port (used by NSRPListener plugin)
-#define DEFAULT_NRPE_PORT 5666
+#define NASTY_METACHARS         "|`&><'\"\\[]{}"        /* This may need to be modified for windows directory seperator */
 
-// The default NSClient port (used by NSClientListener plugin)
-#define DEFAULT_NSCLIENT_PORT 12489
+
+// Default Argumentstring (for consistency)
+#define SHOW_ALL "ShowAll"
+#define SHOW_FAIL "ShowFail"
+#define NSCLIENT "nsclient"
+
+// NSClient Setting headlines
+#define NSCLIENT_SECTION_TITLE "NSClient"
+#define NSCLIENT_SETTINGS_PORT "port"
+#define NSCLIENT_SETTINGS_PORT_DEFAULT 12489
+#define NSCLIENT_SETTINGS_ALLOWED "allowed_hosts"
+#define NSCLIENT_SETTINGS_ALLOWED_DEFAULT ""
+#define NSCLIENT_SETTINGS_PWD "password"
+#define NSCLIENT_SETTINGS_PWD_DEFAULT ""
 
 // NRPE Settings headlines
@@ -31 +40 @@
 #define NRPE_HANDLER_SECTION_TITLE "NRPE Handlers"
 #define NRPE_SETTINGS_TIMEOUT "command_timeout"
+#define NRPE_SETTINGS_TIMEOUT_DEFAULT 60
 #define NRPE_SETTINGS_ALLOWED "allowed_hosts"
+#define NRPE_SETTINGS_ALLOWED_DEFAULT ""
 #define NRPE_SETTINGS_PORT "port"
+#define NRPE_SETTINGS_PORT_DEFAULT 5666
 #define NRPE_SETTINGS_ALLOW_ARGUMENTS "allow_arguments"
+#define NRPE_SETTINGS_ALLOW_ARGUMENTS_DEFAULT 0
 #define NRPE_SETTINGS_ALLOW_NASTY_META "allow_nasty_meta_chars"
+#define NRPE_SETTINGS_ALLOW_NASTY_META_DEFAULT 0
+#define NRPE_SETTINGS_USE_SSL "use_ssl"
+#define NRPE_SETTINGS_USE_SSL_DEFAULT 1
 
+// Check System Settings
+#define C_SYSTEM_SECTION_TITLE "Check System"
+#define C_SYSTEM_CPU_BUFFER_TIME "CPUBufferSize" 
+#define C_SYSTEM_CPU_BUFFER_TIME_DEFAULT "1h"
+#define C_SYSTEM_CHECK_RESOLUTION "CheckResolution"
+#define C_SYSTEM_CHECK_RESOLUTION_DEFAULT 10 /* unit: second/10 */
+#define C_SYSTEM_MEM_PAGE_LIMIT "CounterPageLimit"
+#define C_SYSTEM_MEM_PAGE_LIMIT_DEFAULT "\\\\.\\Memory\\Commit Limit"
+#define C_SYSTEM_MEM_PAGE "CounterPage"
+#define C_SYSTEM_MEM_PAGE_DEFAULT "\\\\.\\Memory\\Committed Bytes"
+#define C_SYSTEM_UPTIME "CounterUptime"
+#define C_SYSTEM_UPTIME_DEFAULT "\\\\.\\System\\System Up Time"
+#define C_SYSTEM_CPU "CounterCPU"
+#define C_SYSTEM_MEM_CPU_DEFAULT "\\\\.\\Processor(_total)\\% Processor Time"
 
+// Log to File Settings
+#define LOG_SECTION_TITLE "log"
+#define LOG_FILENAME "file" 
+#define LOG_FILENAME_DEFAULT "nsclient.log" 
+

trunk/include/strEx.h

@@ -4 +4 @@
 #include <string>
 #include <utility>
+#include <list>
+#ifdef _DEBUG
+#include <iostream>
+#endif
 
 namespace strEx {
@@ -25 +29 @@
     return ss.str();
   }
+  inline std::string itos(unsigned long long i) {
+    std::stringstream ss;
+    ss << i;
+    return ss.str();
+  }
   inline std::string itos(__int64 i) {
     std::stringstream ss;
@@ -30 +39 @@
     return ss.str();
   }
-  inline std::string itos(DWORD i) {
+  inline std::string itos(unsigned long i) {
     std::stringstream ss;
     ss << i;
@@ -38 +47 @@
     return atoi(s.c_str());
   }
+  inline long long stoi64(std::string s) {
+    return _atoi64(s.c_str());
+  }
+  inline unsigned stoui_as_time(std::string time, unsigned int smallest_unit = 1000) {
+    std::string::size_type p = time.find_first_of("sSmMhHdDwW");
+    unsigned int value = atoi(time.c_str());
+    if (p == std::string::npos)
+      return value * smallest_unit;
+    else if ( (time[p] == 's') || (time[p] == 'S') )
+      return value * 1000;
+    else if ( (time[p] == 'm') || (time[p] == 'M') )
+      return value * 60 * 1000;
+    else if ( (time[p] == 'h') || (time[p] == 'H') )
+      return value * 60 * 60 * 1000;
+    else if ( (time[p] == 'd') || (time[p] == 'D') )
+      return value * 24 * 60 * 60 * 1000;
+    else if ( (time[p] == 'w') || (time[p] == 'W') )
+      return value * 7 * 24 * 60 * 60 * 1000;
+    return value * smallest_unit;
+  }
+  inline unsigned long long stoi64_as_time(std::string time, unsigned int smallest_unit = 1000) {
+    std::string::size_type p = time.find_first_of("sSmMhHdDwW");
+    unsigned long long value = _atoi64(time.c_str());
+    if (p == std::string::npos)
+      return value * smallest_unit;
+    else if ( (time[p] == 's') || (time[p] == 'S') )
+      return value * 1000;
+    else if ( (time[p] == 'm') || (time[p] == 'M') )
+      return value * 60 * 1000;
+    else if ( (time[p] == 'h') || (time[p] == 'H') )
+      return value * 60 * 60 * 1000;
+    else if ( (time[p] == 'd') || (time[p] == 'D') )
+      return value * 24 * 60 * 60 * 1000;
+    else if ( (time[p] == 'w') || (time[p] == 'W') )
+      return value * 7 * 24 * 60 * 60 * 1000;
+    return value * smallest_unit;
+  }
+  inline std::string itos_as_time(unsigned long long time) {
+    if (time > 7 * 24 * 60 * 60 * 1000)
+      return itos(static_cast<unsigned int>(time/(7 * 24 * 60 * 60 * 1000))) + "w";
+    else if (time > 24 * 60 * 60 * 1000)
+      return itos(static_cast<unsigned int>(time/(24 * 60 * 60 * 1000))) + "d";
+    else if (time > 60 * 60 * 1000)
+      return itos(static_cast<unsigned int>(time/(60 * 60 * 1000))) + "h";
+    else if (time > 60 * 1000)
+      return itos(static_cast<unsigned int>(time/(60 * 1000))) + "m";
+    else if (time > 1000)
+      return itos(static_cast<unsigned int>(time/(1000))) + "s";
+    return itos(static_cast<unsigned int>(time));
+  }
+
   inline long long stoi64_as_BKMG(std::string s) {
     std::string::size_type p = s.find_first_of("BMKG");

trunk/include/thread.h

@@ -1 +1 @@
 #pragma once
+
+#include <process.h>
+#include <Mutex.h>
+
+class ThreadException {
+public:
+  std::string e_;
+  ThreadException(std::string e) : e_(e) {}
+};
 
 /**
@@ -28 +37 @@
 private:
   HANDLE hThread_;    // Thread handle
-  DWORD dwThreadID_;    // Thread ID
   T* pObject_;      // Wrapped object
   HANDLE hStopEvent_;   // Event to signal that the thread has stopped
+  HANDLE hMutex_;     // Mutex to protect internal data
+
 
   typedef struct thread_param {
-    Thread* manager;  // The thread manager
+    HANDLE hStopEvent;  // The stop event to signal when thread dies
     T *instance;    // The thread instance object
     LPVOID lpParam;   // The optional argument to the thread
+    Thread *pCore;
   } thread_param;
 
@@ -43 +54 @@
    * Sets up default values
    */
-  Thread() : hThread_(NULL), dwThreadID_(0), pObject_(NULL), hStopEvent_(NULL) {}
+  Thread() : hThread_(NULL), pObject_(NULL), hStopEvent_(NULL) {
+    hMutex_ = CreateMutex(NULL, FALSE, NULL);
+    assert(hMutex_ != NULL);
+  }
   /**
    * Default d-tor.
@@ -50 +64 @@
    */
   virtual ~Thread() {
-    if (hThread_)
-      CloseHandle(hThread_);
-    if (hStopEvent_)
-      CloseHandle(hStopEvent_);
+    {
+      MutexLock mutex(hMutex_, 5000L);
+      if (!mutex.hasMutex()) {
+        throw ThreadException("Could not retrieve mutex when killing thread, we are fucked...");
+      }
+      if (hThread_)
+        CloseHandle(hThread_);
+      hThread_ = NULL;
+      if (hStopEvent_)
+        CloseHandle(hStopEvent_);
+      hStopEvent_ = NULL;
+      delete pObject_;
+      pObject_ = NULL;
+    }
+    if (hMutex_)
+      CloseHandle(hMutex_);
+    hMutex_ = NULL;
   }
 
@@ -64 +91 @@
    * @return exit status
    */
-  static DWORD WINAPI threadProc(LPVOID lpParameter) {
+  static void threadProc(LPVOID lpParameter) {
     thread_param* param = static_cast<thread_param*>(lpParameter);
     T* instance = param->instance;
-    Thread *manager = param->manager;
+    HANDLE hStopEvent = param->hStopEvent;
     LPVOID lpParam = param->lpParam;
+    Thread *pCore = param->pCore;
     delete param;
 
-    assert(manager->hStopEvent_);
-    DWORD ret = instance->threadProc(lpParam);
-    BOOL b = SetEvent(manager->hStopEvent_);
-    assert(b);
-    return ret;
+    if (hStopEvent != NULL) {
+      instance->threadProc(lpParam);
+      SetEvent(hStopEvent);
+    }
+    pCore->terminate();
+    _endthread();
   }
 
@@ -89 +118 @@
    */
   void createThread(LPVOID lpParam = NULL) {
-    assert(pObject_ == NULL);
-    assert(hStopEvent_ == NULL);
-    pObject_ = new T;
-    thread_param* param = new thread_param;
-    param->instance = pObject_;
-    param->manager = this;
-    param->lpParam = lpParam;
-    hStopEvent_ = CreateEvent(NULL, TRUE, FALSE, NULL);
-    hThread_ = ::CreateThread(NULL,0,threadProc,reinterpret_cast<VOID*>(param),0,&dwThreadID_);
+    thread_param* param = NULL;
+    {
+      MutexLock mutex(hMutex_, 5000L);
+      if (!mutex.hasMutex()) {
+        throw ThreadException("Could not retrieve mutex, thread not started...");
+      }
+      if (pObject_) {
+        throw ThreadException("Thread already started, thread not started...");
+      }
+      assert(hStopEvent_ == NULL);
+      param = new thread_param;
+      param->instance = pObject_ = new T;
+      param->hStopEvent = hStopEvent_ = CreateEvent(NULL, TRUE, FALSE, NULL);
+      param->lpParam = lpParam;
+      param->pCore = this;
+    }
+    hThread_ = reinterpret_cast<HANDLE>(::_beginthread(threadProc, 0, reinterpret_cast<VOID*>(param)));
+    assert(hThread_ != NULL);
   }
   /**
@@ -105 +143 @@
    */
   bool exitThread(const unsigned int delay = 5000L) {
-    assert(pObject_ != NULL);
-    assert(hStopEvent_ != NULL);
-    pObject_->exitThread();
-
-    DWORD dwWaitResult = WaitForSingleObject(hStopEvent_, delay);
+    DWORD dwWaitResult = -1;
+    {
+      MutexLock mutex(hMutex_, 5000L);
+      if (!mutex.hasMutex()) {
+        throw ThreadException("Could not retrieve mutex, thread not stopped...");
+      }
+      if (!pObject_)
+        return true;
+      assert(hStopEvent_ != NULL);
+      pObject_->exitThread();
+      dwWaitResult = WaitForSingleObject(hStopEvent_, delay);
+    }
     switch (dwWaitResult) {
       // The thread got mutex ownership.
       case WAIT_OBJECT_0:
-        {
-          // @todo pObject should be protected!
-          HANDLE hTmp = hStopEvent_;
-          T* pTmp = pObject_;
-          pObject_ = NULL;
-          delete pTmp;
-          hStopEvent_ = NULL;
-          CloseHandle(hTmp);
-        }
         return true;
         // Did not get a signal due to time-out.
       case WAIT_TIMEOUT: 
         return false; 
-
         // Never got a signal.
       case WAIT_ABANDONED: 
@@ -134 +169 @@
   }
   bool hasActiveThread() const {
-    // @todo pObject should be protected!
+    MutexLock mutex(hMutex_, 5000L);
+    if (!mutex.hasMutex()) {
+      throw ThreadException("Could not retrieve mutex, thread not stopped...");
+    }
     return pObject_ != NULL;
   }
   const T* getThreadConst() const {
-    // @todo pObject should be protected!
+    MutexLock mutex(hMutex_, 5000L);
+    if (!mutex.hasMutex()) {
+      throw ThreadException("Could not retrieve mutex, thread not stopped...");
+    }
     return pObject_;
   }
   T* getThread() const {
-    // @todo pObject should be protected!
+    MutexLock mutex(hMutex_, 5000L);
+    if (!mutex.hasMutex()) {
+      throw ThreadException("Could not retrieve mutex, thread not stopped...");
+    }
     return pObject_;
   }
+private:
+  void terminate() {
+    MutexLock mutex(hMutex_, 5000L);
+    if (!mutex.hasMutex()) {
+      throw ThreadException("Could not retrieve mutex, thread not stopped...");
+    }
+    delete pObject_;
+    pObject_ = NULL;
+    CloseHandle(hStopEvent_);
+    hStopEvent_ = NULL;
+    hThread_ = NULL;
+  }
 };
 

trunk/modules/CheckDisk/CheckDisk.cpp

@@ -6 +6 @@
 #include <strEx.h>
 #include <time.h>
+#include <utils.h>
 
 CheckDisk gCheckDisk;
@@ -82 +83 @@
 }
 
-NSCAPI::nagiosReturn CheckDisk::CheckFileSize(const unsigned int argLen, char **char_args, std::string &message, std::string &perf) {
+NSCAPI::nagiosReturn CheckDisk::CheckDriveSize(const unsigned int argLen, char **char_args, std::string &message, std::string &perf) {
   // CheckFileSize
-  // request: CheckFileSize&<option>&<option>...
+  // request: CheckFileSize <option> <option>...
   // <option>     MaxWarn=<size gmkb>
   //          MaxCrit=<size gmkb>
@@ -100 +101 @@
   // Examples:
   // <return string>  <directory> <size gmkb> ... |<shortname>=<size>:<warn>:<crit>
-  // test: CheckFileSize&ShowAll&MaxWarn=1024M&MaxCrit=4096M&File:WIN=c:\WINDOWS\*.*
+  // test: CheckFileSize ShowAll MaxWarn=1024M MaxCrit=4096M File:WIN=c:\WINDOWS\*.*
+  //       CheckFileSize
+  //
+  // check_nscp -H <ip> -p <port> -s <passwd> -c <commandstring>
+  //
+  // ./check_nscp -H 192.168.0.167 -p 1234 -s pwd -c 'CheckFileSize&ShowAll&MaxWarn=1024M&MaxCrit=4096M&File:WIN=c:\WINDOWS\*.*'
+  // WIN: 1G (2110962363B)|WIN:2110962363:1073741824:4294967296
+  NSC_DEBUG_MSG("CheckDriveSize");
+  NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK;
+  std::list<std::string> args = arrayBuffer::arrayBuffer2list(argLen, char_args);
+  if (args.empty()) {
+    message = "Missing argument(s).";
+    return NSCAPI::returnCRIT;
+  }
+
+  checkHolders::SizeMaxMin warn;
+  checkHolders::SizeMaxMin crit;
+  bool bShowAll = false;
+  bool bNSClient = false;
+  std::list<std::string> drives;
+
+  std::list<std::string>::const_iterator cit;
+  for (cit=args.begin();cit!=args.end();++cit) {
+    std::string arg = *cit;
+    std::pair<std::string,std::string> p = strEx::split(arg,"=");
+    if (p.first == "Drive") {
+      drives.push_back(p.second);
+    } else if (p.first == "MaxWarn") {
+      warn.max.set(p.second);
+    } else if (p.first == "MinWarn") {
+      warn.min.set(p.second);
+    } else if (p.first == "MaxCrit") {
+      crit.max.set(p.second);
+    } else if (p.first == "MinCrit") {
+      crit.min.set(p.second);
+    } else if (p.first == "ShowAll") {
+      bShowAll = true;
+    } else if (p.first == "nsclient") {
+      bNSClient = true;
+    } else {
+      drives.push_back(p.first);
+    }
+  }
+
+  NSC_DEBUG_MSG_STD("Bounds: critical " + crit.min.toString() + " > size > " + crit.max.toString());
+  NSC_DEBUG_MSG_STD("Bounds: warning " + warn.min.toString() + " > size > " + warn.max.toString());
+  NSC_DEBUG_MSG_STD("Showall: " + ((bShowAll)?"yeap":"noop"));
+  NSC_DEBUG_MSG_STD("nsclient: " + ((bNSClient)?"yeap":"noop"));
+
+  for (std::list<std::string>::iterator it = drives.begin();it!=drives.end();it++) {
+    std::string drive = (*it);
+    if (drive.length() == 1)
+      drive += ":";
+    if (GetDriveType(drive.c_str()) != DRIVE_FIXED){
+      message = "ERROR: Drive is not a fixed drive: " + drive;
+      return NSCAPI::returnUNKNOWN;
+    }
+    ULARGE_INTEGER freeBytesAvailableToCaller;
+    ULARGE_INTEGER totalNumberOfBytes;
+    ULARGE_INTEGER totalNumberOfFreeBytes;
+    if (!GetDiskFreeSpaceEx(drive.c_str(), &freeBytesAvailableToCaller, &totalNumberOfBytes, &totalNumberOfFreeBytes)) {
+      message = "ERROR: Could not get free space for" + drive;
+      return NSCAPI::returnUNKNOWN;
+    }
+
+    if (bNSClient) {
+      message += strEx::itos(totalNumberOfFreeBytes.QuadPart) + "&";
+      message += strEx::itos(totalNumberOfBytes.QuadPart) + "&";
+    } else {
+      std::string tStr;
+      long long usedSpace = totalNumberOfBytes.QuadPart-totalNumberOfFreeBytes.QuadPart;
+      long long totalSpace = totalNumberOfBytes.QuadPart;
+      if (crit.max.hasBounds() && crit.max.checkMAX(usedSpace, totalSpace)) {
+        message += crit.max.prettyPrint(drive, usedSpace, totalSpace);
+        NSCHelper::escalteReturnCodeToCRIT(returnCode);
+      } else if (crit.min.hasBounds() && crit.min.checkMIN(usedSpace, totalSpace)) {
+        tStr = crit.min.prettyPrint(drive, usedSpace, totalSpace);
+        NSCHelper::escalteReturnCodeToCRIT(returnCode);
+      } else if (warn.max.hasBounds() && warn.max.checkMAX(usedSpace, totalSpace)) {
+        tStr = warn.max.prettyPrint(drive, usedSpace, totalSpace);
+        NSCHelper::escalteReturnCodeToWARN(returnCode);
+      } else if (warn.min.hasBounds() && warn.min.checkMIN(usedSpace, totalSpace)) {
+        tStr = warn.min.prettyPrint(drive, usedSpace, totalSpace);
+        NSCHelper::escalteReturnCodeToWARN(returnCode);
+      } else if (bShowAll) {
+        tStr = drive + ": " + strEx::itos_as_BKMG(usedSpace);
+      }
+      perf += checkHolders::SizeMaxMin::printPerf(drive, usedSpace, totalSpace, warn, crit);
+      if (!message.empty() && !tStr.empty())
+        message += ", ";
+      if (!tStr.empty())
+        message += tStr;
+    }
+  }
+  if (message.empty())
+    message = "All drive sizes are within bounds.";
+  return returnCode;
+}
+
+NSCAPI::nagiosReturn CheckDisk::CheckFileSize(const unsigned int argLen, char **char_args, std::string &message, std::string &perf) {
+  // CheckFileSize
+  // request: CheckFileSize <option> <option>...
+  // <option>     MaxWarn=<size gmkb>
+  //          MaxCrit=<size gmkb>
+  //          MinWarn=<size gmkb>
+  //          MinCrit=<size gmkb>
+  //          ShowAll
+  //          File=<path>
+  //          File:<shortname>=<path>
+  //
+  // Return: <return state>&<return string>...
+  // <return state> 0 - No errors
+  //          1 - Unknown
+  //          2 - Errors
+  // <size gmkb> is a size with a possible modifier letter (such as G for gigabyte, M for Megabyte, K for kilobyte etc)
+  // Examples:
+  // <return string>  <directory> <size gmkb> ... |<shortname>=<size>:<warn>:<crit>
+  // test: CheckFileSize ShowAll MaxWarn=1024M MaxCrit=4096M File:WIN=c:\WINDOWS\*.*
   //       CheckFileSize
   //
@@ -196 +314 @@
   if (command == "CheckFileSize") {
     return CheckFileSize(argLen, char_args, msg, perf);
+  } else if (command == "CheckDriveSize") {
+    return CheckDriveSize(argLen, char_args, msg, perf);
+
 //  } else if (command == "CheckFileDate") {
   } 

trunk/modules/CheckDisk/CheckDisk.h

@@ -18 +18 @@
   // Check commands
   NSCAPI::nagiosReturn CheckFileSize(const unsigned int argLen, char **char_args, std::string &message, std::string &perf);
+  NSCAPI::nagiosReturn CheckDriveSize(const unsigned int argLen, char **char_args, std::string &message, std::string &perf);
 };

trunk/modules/CheckDisk/CheckDisk.vcproj

@@ -21 +21 @@
         Optimization="0"
         AdditionalIncludeDirectories="../include;../../include"
-        PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_STATIC_LIB;_STLP_USE_NEWALLOC"
+        PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1"
         MinimalRebuild="TRUE"
         BasicRuntimeChecks="3"
-        RuntimeLibrary="1"
+        RuntimeLibrary="3"
         UsePrecompiledHeader="3"
         WarningLevel="3"
@@ -71 +71 @@
         Name="VCCLCompilerTool"
         AdditionalIncludeDirectories="../include;../../include"
-        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_STLP_USE_STATIC_LIB;SYSTRAY_EXPORTS"
-        RuntimeLibrary="0"
+        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
+        RuntimeLibrary="2"
         UsePrecompiledHeader="3"
         WarningLevel="3"
@@ -112 +112 @@
     </Configuration>
     <Configuration
-      Name="Dynamic Linkage|Win32"
-      OutputDirectory="$(ConfigurationName)"
-      IntermediateDirectory="$(ConfigurationName)"
-      ConfigurationType="2"
-      CharacterSet="2">
-      <Tool
-        Name="VCCLCompilerTool"
-        AdditionalIncludeDirectories="../include;../../include"
-        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-        RuntimeLibrary="2"
-        UsePrecompiledHeader="3"
-        WarningLevel="3"
-        Detect64BitPortabilityProblems="TRUE"
-        DebugInformationFormat="3"/>
-      <Tool
-        Name="VCCustomBuildTool"/>
-      <Tool
-        Name="VCLinkerTool"
-        OutputFile="../../Release/modules/$(ProjectName).dll"
-        LinkIncremental="1"
-        ModuleDefinitionFile="CheckDisk.def"
-        GenerateDebugInformation="TRUE"
-        SubSystem="2"
-        OptimizeReferences="2"
-        EnableCOMDATFolding="2"
-        ImportLibrary="$(OutDir)/CheckDisk.lib"
-        TargetMachine="1"/>
-      <Tool
-        Name="VCMIDLTool"/>
-      <Tool
-        Name="VCPostBuildEventTool"/>
-      <Tool
-        Name="VCPreBuildEventTool"/>
-      <Tool
-        Name="VCPreLinkEventTool"/>
-      <Tool
-        Name="VCResourceCompilerTool"/>
-      <Tool
-        Name="VCWebServiceProxyGeneratorTool"/>
-      <Tool
-        Name="VCXMLDataGeneratorTool"/>
-      <Tool
-        Name="VCWebDeploymentTool"/>
-      <Tool
-        Name="VCManagedWrapperGeneratorTool"/>
-      <Tool
-        Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-    </Configuration>
-    <Configuration
-      Name="Debug Dynamic Linkage|Win32"
-      OutputDirectory="$(ConfigurationName)"
-      IntermediateDirectory="$(ConfigurationName)"
-      ConfigurationType="2"
-      CharacterSet="2">
-      <Tool
-        Name="VCCLCompilerTool"
-        Optimization="0"
-        AdditionalIncludeDirectories="../include;../../include"
-        PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1"
-        MinimalRebuild="TRUE"
-        BasicRuntimeChecks="3"
-        RuntimeLibrary="3"
-        UsePrecompiledHeader="3"
-        WarningLevel="3"
-        Detect64BitPortabilityProblems="TRUE"
-        DebugInformationFormat="4"/>
-      <Tool
-        Name="VCCustomBuildTool"/>
-      <Tool
-        Name="VCLinkerTool"
-        OutputFile="../../Debug/modules/$(ProjectName).dll"
-        LinkIncremental="2"
-        ModuleDefinitionFile="CheckDisk.def"
-        GenerateDebugInformation="TRUE"
-        ProgramDatabaseFile="$(OutDir)/CheckDisk.pdb"
-        SubSystem="2"
-        ImportLibrary="$(OutDir)/CheckDisk.lib"
-        TargetMachine="1"/>
-      <Tool
-        Name="VCMIDLTool"/>
-      <Tool
-        Name="VCPostBuildEventTool"/>
-      <Tool
-        Name="VCPreBuildEventTool"/>
-      <Tool
-        Name="VCPreLinkEventTool"/>
-      <Tool
-        Name="VCResourceCompilerTool"/>
-      <Tool
-        Name="VCWebServiceProxyGeneratorTool"/>
-      <Tool
-        Name="VCXMLDataGeneratorTool"/>
-      <Tool
-        Name="VCWebDeploymentTool"/>
-      <Tool
-        Name="VCManagedWrapperGeneratorTool"/>
-      <Tool
-        Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
-    </Configuration>
-    <Configuration
       Name="Distribution|Win32"
       OutputDirectory="$(ConfigurationName)"
@@ -292 +192 @@
         </FileConfiguration>
         <FileConfiguration
-          Name="Dynamic Linkage|Win32">
+          Name="Distribution|Win32">
           <Tool
             Name="VCCLCompilerTool"
             UsePrecompiledHeader="1"/>
         </FileConfiguration>
-        <FileConfiguration
-          Name="Debug Dynamic Linkage|Win32">
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="1"/>
+      </File>
+      <File
+        RelativePath="..\..\include\utils.cpp">
+        <FileConfiguration
+          Name="Debug|Win32">
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"/>
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Release|Win32">
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"/>
         </FileConfiguration>
         <FileConfiguration
@@ -307 +216 @@
           <Tool
             Name="VCCLCompilerTool"
-            UsePrecompiledHeader="1"/>
+            UsePrecompiledHeader="0"/>
         </FileConfiguration>
       </File>
@@ -323 +232 @@
       <File
         RelativePath=".\stdafx.h">
+      </File>
+      <File
+        RelativePath="..\..\include\utils.h">
       </File>
     </Filter>

trunk/modules/FileLogger/FileLogger.cpp

@@ -19 +19 @@
 
 bool FileLogger::loadModule() {
-  file_ = NSCModuleHelper::getSettingsString("log", "file", "nsclient.log");
+  file_ = NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_FILENAME, LOG_FILENAME_DEFAULT);
   return true;
 }
@@ -26 +26 @@
 }
 std::string FileLogger::getModuleName() {
-  return "File logger: " + NSCModuleHelper::getSettingsString("log", "file", "nsclient.log");
+  return "File logger: " + NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_FILENAME, LOG_FILENAME_DEFAULT);
 }
 NSCModuleWrapper::module_version FileLogger::getModuleVersion() {

trunk/modules/FileLogger/FileLogger.vcproj

@@ -204 +204 @@
       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
       <File
+        RelativePath="..\..\include\config.h">
+      </File>
+      <File
         RelativePath=".\FileLogger.h">
       </File>

trunk/modules/FileLogger/stdafx.h

@@ -16 +16 @@
 #include <fstream>
 
+#include <config.h>
+
 
 // TODO: reference additional headers your program requires here

trunk/modules/NRPEListener/NRPEListener.cpp

@@ -7 +7 @@
 #include <time.h>
 #include <config.h>
+#include "NRPEPacket.h"
 
 NRPEListener gNRPEListener;
@@ -24 +25 @@
 
 bool NRPEListener::loadModule() {
-  timeout = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_TIMEOUT ,60);
+  bUseSSL_ = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_USE_SSL ,NRPE_SETTINGS_USE_SSL_DEFAULT)==1;
+  timeout = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_TIMEOUT ,NRPE_SETTINGS_TIMEOUT_DEFAULT);
   std::list<std::string> commands = NSCModuleHelper::getSettingsSection(NRPE_HANDLER_SECTION_TITLE);
   std::list<std::string>::iterator it;
@@ -40 +42 @@
   }
 
-  socket.setAllowedHosts(strEx::splitEx(NSCModuleHelper::getSettingsString(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOWED, ""), ","));
+  allowedHosts.setAllowedHosts(strEx::splitEx(NSCModuleHelper::getSettingsString(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOWED, NRPE_SETTINGS_ALLOWED_DEFAULT), ","));
   try {
-    socket.StartListen(NSCModuleHelper::getSettingsInt("NSClient", NRPE_SETTINGS_PORT, DEFAULT_NRPE_PORT));
+    if (bUseSSL_) {
+      socket_ssl_.setHandler(this);
+      socket_ssl_.StartListener(NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_PORT, NRPE_SETTINGS_PORT_DEFAULT));
+    } else {
+      socket_.setHandler(this);
+      socket_.StartListener(NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_PORT, NRPE_SETTINGS_PORT_DEFAULT));
+    }
   } catch (simpleSocket::SocketException e) {
     NSC_LOG_ERROR_STD("Exception caught: " + e.getMessage());
     return false;
-  }
+  } catch (simpleSSL::SSLException e) {
+    NSC_LOG_ERROR_STD("Exception caught: " + e.getMessage());
+    return false;
+  }
+
   return true;
 }
 bool NRPEListener::unloadModule() {
   try {
-    socket.close();
+    if (bUseSSL_) {
+      socket_ssl_.removeHandler(this);
+      socket_ssl_.StopListener();
+    } else {
+      socket_.removeHandler(this);
+      socket_.StopListener();
+    }
   } catch (simpleSocket::SocketException e) {
+    NSC_LOG_ERROR_STD("Exception caught: " + e.getMessage());
+    return false;
+  } catch (simpleSSL::SSLException e) {
     NSC_LOG_ERROR_STD("Exception caught: " + e.getMessage());
     return false;
@@ -81 +102 @@
 
   std::string str = (*it).second;
-  if (NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_ARGUMENTS, 0) == 1) {
+  if (NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_ARGUMENTS, NRPE_SETTINGS_ALLOW_ARGUMENTS_DEFAULT) == 1) {
     arrayBuffer::arrayList arr = arrayBuffer::arrayBuffer2list(argLen, char_args);
     arrayBuffer::arrayList::const_iterator cit = arr.begin();
@@ -87 +108 @@
 
     for (;cit!=arr.end();cit++,i++) {
-      if (NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_NASTY_META, 0) == 0) {
+      if (NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_NASTY_META, NRPE_SETTINGS_ALLOW_NASTY_META_DEFAULT) == 0) {
         if ((*cit).find_first_of(NASTY_METACHARS) != std::string::npos) {
           NSC_LOG_ERROR("Request string contained illegal metachars!");
@@ -199 +220 @@
   return result;
 }
-
+void NRPEListener::onClose()
+{}
+
+void NRPEListener::onAccept(simpleSocket::Socket &client) 
+{
+  if (!allowedHosts.inAllowedHosts(client.getAddrString())) {
+    NSC_LOG_ERROR("Unothorized access from: " + client.getAddrString());
+    client.close();
+    return;
+  }
+  try {
+    simpleSocket::DataBuffer block;
+
+    for (int i=0;i<100;i++) {
+      client.readAll(block);
+      if (block.getLength() >= NRPEPacket::getBufferLength())
+        break;
+      Sleep(100);
+    }
+    if (i == 100) {
+      NSC_LOG_ERROR_STD("Could not retrieve NRPE packet.");
+      client.close();
+      return;
+    }
+
+    if (block.getLength() == NRPEPacket::getBufferLength()) {
+      try {
+        NRPEPacket out = handlePacket(NRPEPacket(block.getBuffer(), block.getLength()));
+        block.copyFrom(out.getBuffer(), out.getBufferLength());
+      } catch (NRPEPacket::NRPEPacketException e) {
+        NSC_LOG_ERROR_STD("NRPESocketException: " + e.getMessage());
+        client.close();
+        return;
+      }
+      client.send(block);
+    }
+  } catch (simpleSocket::SocketException e) {
+    NSC_LOG_ERROR_STD("SocketException: " + e.getMessage());
+  } catch (NRPEException e) {
+    NSC_LOG_ERROR_STD("NRPEException: " + e.getMessage());
+  }
+  client.close();
+}
+
+NRPEPacket NRPEListener::handlePacket(NRPEPacket p) {
+  if (p.getType() != NRPEPacket::queryPacket) {
+    NSC_LOG_ERROR("Request is not a query.");
+    throw NRPEException("Invalid query type");
+  }
+  if (p.getVersion() != NRPEPacket::version2) {
+    NSC_LOG_ERROR("Request had unsupported version.");
+    throw NRPEException("Invalid version");
+  }
+  if (!p.verifyCRC()) {
+    NSC_LOG_ERROR("Request had invalid checksum.");
+    throw NRPEException("Invalid checksum");
+  }
+  strEx::token cmd = strEx::getToken(p.getPayload(), '!');
+  std::string msg, perf;
+  NSC_DEBUG_MSG_STD("Command: " + cmd.first);
+  NSC_DEBUG_MSG_STD("Arguments: " + cmd.second);
+
+  if (NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_ARGUMENTS, NRPE_SETTINGS_ALLOW_ARGUMENTS_DEFAULT) == 0) {
+    if (!cmd.second.empty()) {
+      NSC_LOG_ERROR("Request contained arguments (not currently allowed).");
+      throw NRPEException("Request contained arguments (not currently allowed).");
+    }
+  }
+  if (NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_NASTY_META, NRPE_SETTINGS_ALLOW_NASTY_META_DEFAULT) == 0) {
+    if (cmd.first.find_first_of(NASTY_METACHARS) != std::string::npos) {
+      NSC_LOG_ERROR("Request command contained illegal metachars!");
+      throw NRPEException("Request command contained illegal metachars!");
+    }
+    if (cmd.second.find_first_of(NASTY_METACHARS) != std::string::npos) {
+      NSC_LOG_ERROR("Request arguments contained illegal metachars!");
+      throw NRPEException("Request command contained illegal metachars!");
+    }
+  }
+
+  NSCAPI::nagiosReturn ret = NSCModuleHelper::InjectSplitAndCommand(cmd.first, cmd.second, '!', msg, perf);
+  if (perf.empty()) {
+    return NRPEPacket(NRPEPacket::responsePacket, NRPEPacket::version2, ret, msg);
+  } else {
+    return NRPEPacket(NRPEPacket::responsePacket, NRPEPacket::version2, ret, msg + "|" + perf);
+  }
+}
 
 NSC_WRAPPERS_MAIN_DEF(gNRPEListener);

trunk/modules/NRPEListener/NRPEListener.h

@@ -1 +1 @@
 NSC_WRAPPERS_MAIN();
+#include <Socket.h>
+#include <SSLSocket.h>
+#include <map>
+#include "NRPEPacket.h"
 
-
-#include "NRPESocket.h"
-#include <Socket.h>
-#include <map>
-
-class NRPEListener {
+class NRPEListener : public simpleSocket::ListenerHandler {
 private:
-  NRPESocket socket;
+  bool bUseSSL_;
+  simpleSSL::Listener socket_ssl_;
+  simpleSocket::Listener<> socket_;
   typedef std::map<std::string, std::string> commandList;
   commandList commands;
   unsigned int timeout;
+  socketHelpers::allowedHosts allowedHosts;
 
 public:
@@ -26 +28 @@
 
 private:
+  class NRPEException {
+    std::string error_;
+  public:
+/*    NRPESocketException(simpleSSL::SSLException e) {
+      error_ = e.getMessage();
+    }
+    NRPEException(NRPEPacket::NRPEPacketException e) {
+      error_ = e.getMessage();
+    }
+    */
+    NRPEException(std::string s) {
+      error_ = s;
+    }
+    std::string getMessage() {
+      return error_;
+    }
+  };
+
+
+private:
+  void onAccept(simpleSocket::Socket &client);
+  void onClose();
+
+
+  NRPEPacket handlePacket(NRPEPacket p);
   int executeNRPECommand(std::string command, std::string &msg, std::string &perf);
   void addCommand(std::string key, std::string args) {
     commands[key] = args;
   }
+
 };
 

trunk/modules/NRPEListener/NRPEListener.vcproj

@@ -33 +33 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="ws2_32.lib"
+        AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
         OutputFile="../../Debug/modules/$(ProjectName).dll"
         LinkIncremental="2"
+        AdditionalLibraryDirectories="&quot;C:\Source\openssl-0.9.7f\out32dll.dbg&quot;"
         ModuleDefinitionFile="NRPEListener.def"
         GenerateDebugInformation="TRUE"
@@ -82 +83 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="ws2_32.lib"
+        AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
         OutputFile="../../Release/modules/$(ProjectName).dll"
         LinkIncremental="1"
+        AdditionalLibraryDirectories="&quot;C:\Source\openssl-0.9.7f\out32dll&quot;"
         ModuleDefinitionFile="NRPEListener.def"
         GenerateDebugInformation="TRUE"
@@ -132 +134 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="ws2_32.lib"
+        AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
         OutputFile="../../Dist/modules/$(ProjectName).dll"
         LinkIncremental="1"
@@ -181 +183 @@
       </File>
       <File
-        RelativePath=".\NRPESocket.cpp">
+        RelativePath=".\NRPEPacket.cpp">
       </File>
       <File
@@ -190 +192 @@
       </File>
       <File
+        RelativePath="..\..\include\SSLSocket.cpp">
+      </File>
+      <File
         RelativePath=".\stdafx.cpp">
         <FileConfiguration
@@ -208 +213 @@
             Name="VCCLCompilerTool"
             UsePrecompiledHeader="1"/>
+        </FileConfiguration>
+      </File>
+      <File
+        RelativePath="..\..\include\utils.cpp">
+        <FileConfiguration
+          Name="Debug|Win32">
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"/>
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Release|Win32">
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"/>
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Distribution|Win32">
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"/>
         </FileConfiguration>
       </File>
@@ -219 +245 @@
       </File>
       <File
+        RelativePath="..\..\include\config.h">
+      </File>
+      <File
         RelativePath=".\NRPEListener.h">
       </File>
       <File
-        RelativePath=".\NRPESocket.h">
-      </File>
-      <File
         RelativePath="..\..\include\NSCHelper.h">
       </File>
@@ -231 +257 @@
       </File>
       <File
+        RelativePath="..\..\include\SSLSocket.h">
+      </File>
+      <File
         RelativePath=".\stdafx.h">
       </File>
       <File
         RelativePath="..\..\include\thread.h">
+      </File>
+      <File
+        RelativePath="..\..\include\utils.h">
       </File>
     </Filter>

trunk/modules/NRPEListener/NRPESocket.cpp

@@ -3 +3 @@
 #include "NRPESocket.h"
 
-/**
- * Default c-tor
- */
-NRPESocket::NRPESocket() {
-}
-
-NRPESocket::~NRPESocket() {
-}
 
 
 
-typedef short int16_t;
-typedef unsigned long u_int32_t;
 
-static unsigned long crc32_table[256];
-static bool hascrc32 = false;
-void generate_crc32_table(void){
-  unsigned long crc, poly;
-  int i, j;
-  poly=0xEDB88320L;
-  for(i=0;i<256;i++){
-    crc=i;
-    for(j=8;j>0;j--){
-      if(crc & 1)
-        crc=(crc>>1)^poly;
-      else
-        crc>>=1;
-    }
-    crc32_table[i]=crc;
-  }
-  hascrc32 = true;
-}
-unsigned long calculate_crc32(const char *buffer, int buffer_size){
-  if (!hascrc32)
-    generate_crc32_table();
-  register unsigned long crc;
-  int this_char;
-  int current_index;
-
-  crc=0xFFFFFFFF;
-
-  for(current_index=0;current_index<buffer_size;current_index++){
-    this_char=(int)buffer[current_index];
-    crc=((crc>>8) & 0x00FFFFFF) ^ crc32_table[(crc ^ this_char) & 0xFF];
-  }
-
-  return (crc ^ 0xFFFFFFFF);
+const char* NRPEPacket::getBuffer() {
+  delete [] tmpBuffer;
+  tmpBuffer = new char[getBufferLength()];
+  packet *p = reinterpret_cast<packet*>(tmpBuffer);
+  p->result_code = htons(NSCHelper::nagios2int(result_));
+  p->packet_type = htons(type_);
+  p->packet_version = htons(version_);
+  p->crc32_value = 0;
+  strncpy(p->buffer, payload_.c_str(), 1023);
+  p->buffer[1024] = 0;
+  p->crc32_value = htonl(calculate_crc32(tmpBuffer, getBufferLength()));
+  return tmpBuffer;
 }
 
-
-class NRPEPacket {
-public:
-  static const short queryPacket = 1;
-  static const short responsePacket = 2;
-  static const short version2 = 2;
-private:
-  typedef struct packet {
-    int16_t   packet_version;
-    int16_t   packet_type;
-    u_int32_t crc32_value;
-    int16_t   result_code;
-    char      buffer[1024];
-  } packet;
-  std::string payload_;
-  short type_;
-  short version_;
-  NSCAPI::nagiosReturn result_;
-  unsigned int crc32_;
-  unsigned int calculatedCRC32_;
-  char *tmpBuffer;
-public:
-  NRPEPacket(const char *buffer) : tmpBuffer(NULL) {
-    const packet *p = reinterpret_cast<const packet*>(buffer);
-    type_ = ntohs(p->packet_type);
-    assert( (type_ == queryPacket)||(type_ == responsePacket));
-    version_ = ntohs(p->packet_version);
-    assert(version_ == version2);
-    crc32_ = ntohl(p->crc32_value);
-    // Verify CRC32
-    // @todo Fix this, currently we need a const buffer so we cannot change the crc to 0.
-    char * tb = new char[getBufferLength()];
-    memcpy(tb, buffer, getBufferLength());
-    packet *p2 = reinterpret_cast<packet*>(tb);
-    p2->crc32_value = 0;
-    calculatedCRC32_ = calculate_crc32(tb, getBufferLength());
-    delete [] tb;
-    // Verify CRC32 end
-    result_ = NSCHelper::int2nagios(ntohs(p->result_code));
-    payload_ = std::string(p->buffer);
-  }
-  NRPEPacket(short type, short version, NSCAPI::nagiosReturn result, std::string payLoad) 
-    : tmpBuffer(NULL) 
-    ,type_(type)
-    ,version_(version)
-    ,result_(result)
-    ,payload_(payLoad)
-  {
-  }
-  ~NRPEPacket() {
-    delete [] tmpBuffer;
-  }
-  unsigned short getVersion() const { return version_; }
-  unsigned short getType() const { return type_; }
-  unsigned short getResult() const { return result_; }
-  std::string getPayload() const { return payload_; }
-  const char* getBuffer() {
-    delete [] tmpBuffer;
-    tmpBuffer = new char[getBufferLength()];
-    packet *p = reinterpret_cast<packet*>(tmpBuffer);
-    p->result_code = htons(NSCHelper::nagios2int(result_));
-    p->packet_type = htons(type_);
-    p->packet_version = htons(version_);
-    p->crc32_value = 0;
-    strncpy(p->buffer, payload_.c_str(), 1023);
-    p->buffer[1024] = 0;
-    p->crc32_value = htonl(calculate_crc32(tmpBuffer, getBufferLength()));
-    return tmpBuffer;
-  }
-  bool verifyCRC() {
-    return calculatedCRC32_ == crc32_;
-  }
-  const unsigned int getBufferLength() const {
-    return sizeof(packet);
-  }
-};
-
-void NRPESocket::onAccept(simpleSocket::Socket client) {
-  if (!inAllowedHosts(client.getAddrString())) {
-    NSC_LOG_ERROR("Unothorized access from: " + client.getAddrString());
-    client.close();
-    return;
-  }
-  simpleSocket::DataBuffer block;
-  client.readAll(block);
-  NRPEPacket p(block.getBuffer());
-  if (p.getType() != NRPEPacket::queryPacket) {
-    NSC_LOG_ERROR("Request is not a query.");
-    client.close();
-    return;
-  }
-  if (p.getVersion() != NRPEPacket::version2) {
-    NSC_LOG_ERROR("Request had unsupported version.");
-    client.close();
-    return;
-  }
-  if (!p.verifyCRC()) {
-    NSC_LOG_ERROR("Request had invalid checksum.");
-    client.close();
-    return;
-  }
-  strEx::token cmd = strEx::getToken(p.getPayload(), '!');
-  std::string msg, perf;
-  NSC_DEBUG_MSG_STD("Command: " + cmd.first);
-  NSC_DEBUG_MSG_STD("Arguments: " + cmd.second);
-
-  if (NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_ARGUMENTS, 0) == 0) {
-    if (!cmd.second.empty()) {
-      NSC_LOG_ERROR("Request contained arguments (not currently allowed).");
-      client.close();
-      return;
-    }
-  }
-  if (NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_NASTY_META, 0) == 0) {
-    if (cmd.first.find_first_of(NASTY_METACHARS) != std::string::npos) {
-      NSC_LOG_ERROR("Request command contained illegal metachars!");
-      client.close();
-      return;
-    }
-    if (cmd.second.find_first_of(NASTY_METACHARS) != std::string::npos) {
-      NSC_LOG_ERROR("Request arguments contained illegal metachars!");
-      client.close();
-      return;
-    }
-  }
-
-  NSCAPI::nagiosReturn ret = NSCModuleHelper::InjectSplitAndCommand(cmd.first, cmd.second, '!', msg, perf);
-  if (perf.empty()) {
-    NRPEPacket p2(NRPEPacket::responsePacket, NRPEPacket::version2, ret, msg);
-    client.send(p2.getBuffer(), p2.getBufferLength(), 0);
-  } else {
-    NRPEPacket p2(NRPEPacket::responsePacket, NRPEPacket::version2, ret, msg + "|" + perf);
-    client.send(p2.getBuffer(), p2.getBufferLength(), 0);
-  }
-  client.close();
-}
-

trunk/modules/NRPEListener/NRPESocket.h

@@ -2 +2 @@
 #include "resource.h"
 #include <Socket.h>
+#include <SSLSocket.h>
+
 /**
  * @ingroup NSClient++
@@ -30 +32 @@
 #define NASTY_METACHARS         "|`&><'\"\\[]{}"        /* This may need to be modified for windows directory seperator */
 
-class NRPESocket : public simpleSocket::Listener {
+typedef short int16_t;
+typedef unsigned long u_int32_t;
+
+
+template <class TBase>
+class NRPESocket : public TBase {
 private:
   strEx::splitList allowedHosts_;
 
+  class NRPESocketException {
+    std::string error_;
+  public:
+    NRPESocketException(simpleSSL::SSLException e) {
+      error_ = e.getMessage();
+    }
+    NRPESocketException(NRPEPacket::NRPEPacketException e) {
+      error_ = e.getMessage();
+    }
+    NRPESocketException(std::string s) {
+      error_ = s;
+    }
+    std::string getMessage() {
+      return error_;
+    }
+  };
+
+
 public:
-  NRPESocket();
-  virtual ~NRPESocket();
-
-  void setAllowedHosts(strEx::splitList allowedHosts) {
-    allowedHosts_ = allowedHosts;
+  NRPESocket() {
   }
-  bool inAllowedHosts(std::string s) {
-    if (allowedHosts_.empty())
-      return true;
-    strEx::splitList::const_iterator cit;
-    for (cit = allowedHosts_.begin();cit!=allowedHosts_.end();++cit) {
-      if ( (*cit) == s)
-        return true;
-    }
-    return false;
+  virtual ~NRPESocket() {
   }
 
+
 private:
-  virtual void onAccept(simpleSocket::Socket client);
+  NRPEPacket handlePacket(NRPEPacket p) {
+    if (p.getType() != NRPEPacket::queryPacket) {
+      NSC_LOG_ERROR("Request is not a query.");
+      throw NRPESocketException("Invalid query type");
+    }
+    if (p.getVersion() != NRPEPacket::version2) {
+      NSC_LOG_ERROR("Request had unsupported version.");
+      throw NRPESocketException("Invalid version");
+    }
+    if (!p.verifyCRC()) {
+      NSC_LOG_ERROR("Request had invalid checksum.");
+      throw NRPESocketException("Invalid checksum");
+    }
+    strEx::token cmd = strEx::getToken(p.getPayload(), '!');
+    std::string msg, perf;
+    NSC_DEBUG_MSG_STD("Command: " + cmd.first);
+    NSC_DEBUG_MSG_STD("Arguments: " + cmd.second);
+
+    if (NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_ARGUMENTS, NRPE_SETTINGS_ALLOW_ARGUMENTS_DEFAULT) == 0) {
+      if (!cmd.second.empty()) {
+        NSC_LOG_ERROR("Request contained arguments (not currently allowed).");
+        throw NRPESocketException("Request contained arguments (not currently allowed).");
+      }
+    }
+    if (NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOW_NASTY_META, NRPE_SETTINGS_ALLOW_NASTY_META_DEFAULT) == 0) {
+      if (cmd.first.find_first_of(NASTY_METACHARS) != std::string::npos) {
+        NSC_LOG_ERROR("Request command contained illegal metachars!");
+        throw NRPESocketException("Request command contained illegal metachars!");
+      }
+      if (cmd.second.find_first_of(NASTY_METACHARS) != std::string::npos) {
+        NSC_LOG_ERROR("Request arguments contained illegal metachars!");
+        throw NRPESocketException("Request command contained illegal metachars!");
+      }
+    }
+
+    NSCAPI::nagiosReturn ret = NSCModuleHelper::InjectSplitAndCommand(cmd.first, cmd.second, '!', msg, perf);
+    if (perf.empty()) {
+      return NRPEPacket(NRPEPacket::responsePacket, NRPEPacket::version2, ret, msg);
+    } else {
+      return NRPEPacket(NRPEPacket::responsePacket, NRPEPacket::version2, ret, msg + "|" + perf);
+    }
+  }
+  void setupDH(simpleSSL::DH &dh);
 };
-
-
-
-

trunk/modules/NRPEListener/stdafx.h

@@ -15 +15 @@
 
 #include <config.h>
+#include <utils.h>
 
 #include <NSCAPI.h>

trunk/modules/NSClientCompat/NSClientCompat.vcproj

@@ -254 +254 @@
       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}">
     </Filter>
-    <File
-      RelativePath=".\ReadMe.txt">
-    </File>
   </Files>
   <Globals>

trunk/modules/NSClientListener/NSClientListener.cpp

@@ -9 +9 @@
 
 NSClientListener gNSClientListener;
+
+
+#define REQ_CLIENTVERSION 1 // Works fine!
+#define REQ_CPULOAD     2 // Quirks
+#define REQ_UPTIME      3 // Works fine!
+#define REQ_USEDDISKSPACE 4 // Works fine!
+#define REQ_SERVICESTATE  5 // Works fine!
+#define REQ_PROCSTATE   6 // Works fine!
+#define REQ_MEMUSE      7 // Works fine!
+//#define REQ_COUNTER   8 // ! - not implemented Have to look at this, if anyone has a sample let me know...
+//#define REQ_FILEAGE   9 // ! - not implemented Dont know how to use
+//#define REQ_INSTANCES 10  // ! - not implemented Dont know how to use
 
 BOOL APIENTRY DllMain( HANDLE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved)
@@ -22 +34 @@
 
 bool NSClientListener::loadModule() {
-  socket.setAllowedHosts(strEx::splitEx(NSCModuleHelper::getSettingsString("NRPE", "allowed_hosts", ""), ","));
+  allowedHosts.setAllowedHosts(strEx::splitEx(NSCModuleHelper::getSettingsString(NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_ALLOWED, NSCLIENT_SETTINGS_ALLOWED_DEFAULT), ","));
   try {
-    socket.StartListen(NSCModuleHelper::getSettingsInt("NSClient", "port", DEFAULT_NSCLIENT_PORT));
+    socket.setHandler(this);
+    socket.StartListener(NSCModuleHelper::getSettingsInt(NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_PORT, NSCLIENT_SETTINGS_PORT_DEFAULT));
   } catch (simpleSocket::SocketException e) {
     NSC_LOG_ERROR_STD("Exception caught: " + e.getMessage());
@@ -33 +46 @@
 bool NSClientListener::unloadModule() {
   try {
-    socket.close();
+    socket.removeHandler(this);
+    socket.StopListener();
   } catch (simpleSocket::SocketException e) {
     NSC_LOG_ERROR_STD("Exception caught: " + e.getMessage());
@@ -49 +63 @@
 }
 
+
+std::string NSClientListener::parseRequest(std::string buffer)  {
+  strEx::token pwd = strEx::getToken(buffer, '&');
+  NSC_DEBUG_MSG("Password: " + pwd.first);
+  if ( (pwd.first.empty()) || (pwd.first != NSCModuleHelper::getSettingsString(NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_PWD, NSCLIENT_SETTINGS_PWD_DEFAULT)) )
+    return "ERROR: Invalid password.";
+  if (pwd.second.empty())
+    return "ERRRO: No command specified.";
+  strEx::token cmd = strEx::getToken(pwd.second, '&');
+  if (cmd.first.empty())
+    return "ERRRO: No command specified.";
+  NSC_DEBUG_MSG("Command: " + cmd.first);
+
+  int c = atoi(cmd.first.c_str());
+
+  // prefix various commands
+  switch (c) {
+    case REQ_CPULOAD:
+      cmd.first = "checkCPU";
+      cmd.second += "&nsclient";
+      break;
+    case REQ_UPTIME:
+      cmd.first = "checkUpTime";
+      cmd.second = "nsclient";
+      break;
+    case REQ_USEDDISKSPACE:
+      cmd.first = "CheckDriveSize";
+      cmd.second += "&nsclient";
+      break;
+    case REQ_CLIENTVERSION:
+      {
+        std::string v = NSCModuleHelper::getSettingsString("nsclient compat", "version", "modern");
+        if (v == "modern")
+          return NSCModuleHelper::getApplicationName() + " " + NSCModuleHelper::getApplicationVersionString();
+        return NSCModuleHelper::getSettingsString("nsclient compat", "version", "modern");
+      }
+    case REQ_SERVICESTATE:
+      cmd.first = "checkServiceState";
+      break;
+    case REQ_PROCSTATE:
+      cmd.first = "checkProcState";
+      break;
+    case REQ_MEMUSE:
+      cmd.first = "checkMem";
+      cmd.second = "nsclient";
+      break;
+  }
+
+
+  std::string message, perf;
+  NSCAPI::nagiosReturn ret = NSCModuleHelper::InjectSplitAndCommand(cmd.first.c_str(), cmd.second.c_str(), '&', message, perf);
+  if (!NSCHelper::isNagiosReturnCode(ret)) {
+    if (message.empty())
+      return "ERROR: Could not complete the request check log file for more information.";
+    return "ERROR: " + message;
+  }
+  switch (c) {
+    case REQ_UPTIME:    // Some check_nt commands has no return code syntax
+    case REQ_MEMUSE:
+    case REQ_CPULOAD:
+    case REQ_CLIENTVERSION:
+    case REQ_USEDDISKSPACE:
+      return message;
+
+    case REQ_SERVICESTATE:  // Some check_nt commands return the return code (coded as a string)
+    case REQ_PROCSTATE:
+      return NSCHelper::translateReturn(ret) + "&" + message;
+
+    default:        // "New" check_nscp also returns performance data
+      if (perf.empty())
+        return NSCHelper::translateReturn(ret) + "&" + message;
+      return NSCHelper::translateReturn(ret) + "&" + message + "|" + perf;
+  }
+}
+
+void NSClientListener::onClose()
+{}
+
+void NSClientListener::onAccept(simpleSocket::Socket &client) {
+  if (!allowedHosts.inAllowedHosts(client.getAddrString())) {
+    NSC_LOG_ERROR("Unothorized access from: " + client.getAddrString());
+    client.close();
+    return;
+  }
+  simpleSocket::DataBuffer db;
+  client.readAll(db);
+  if (db.getLength() > 0) {
+    std::string incoming(db.getBuffer(), db.getLength());
+    NSC_DEBUG_MSG_STD("Incoming data: " + incoming);
+    std::string response = parseRequest(incoming);
+    NSC_DEBUG_MSG("Outgoing data: " + response);
+    client.send(response.c_str(), static_cast<int>(response.length()), 0);
+  }
+  client.close();
+}
+
 NSC_WRAPPERS_MAIN_DEF(gNSClientListener);
 NSC_WRAPPERS_IGNORE_MSG_DEF();

trunk/modules/NSClientListener/NSClientListener.h

@@ -1 @@
-#include "NSClientSocket.h"
+#include <Socket.h>
+#include <string>
+#include <utils.h>
 
 NSC_WRAPPERS_MAIN();
 
-class NSClientListener {
+class NSClientListener  : public simpleSocket::ListenerHandler {
 private:
-  NSClientSocket socket;
+  simpleSocket::Listener<> socket;
+  socketHelpers::allowedHosts allowedHosts;
 
 public:
@@ -15 +18 @@
   std::string getModuleName();
   NSCModuleWrapper::module_version getModuleVersion();
+  std::string parseRequest(std::string buffer);
+
+  // simpleSocket::ListenerHandler implementation
+  void onAccept(simpleSocket::Socket &client);
+  void onClose();
+
 };

trunk/modules/NSClientListener/NSClientListener.vcproj

@@ -122 +122 @@
         Name="VCCLCompilerTool"
         AdditionalIncludeDirectories="../include;../../include"
-        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;NSCLIENTLISTENER_EXPORTS"
+        PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
         RuntimeLibrary="2"
         UsePrecompiledHeader="3"
@@ -179 +179 @@
       <File
         RelativePath=".\NSClientListener.cpp">
-      </File>
-      <File
-        RelativePath=".\NSClientSocket.cpp">
       </File>
       <File
@@ -219 +216 @@
       </File>
       <File
+        RelativePath="..\..\include\config.h">
+      </File>
+      <File
         RelativePath=".\NSClientListener.h">
-      </File>
-      <File
-        RelativePath=".\NSClientSocket.h">
       </File>
       <File

trunk/modules/SysTray/SysTray.vcproj

@@ -207 +207 @@
       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
       <File
+        RelativePath="..\..\include\config.h">
+      </File>
+      <File
         RelativePath="..\..\include\NSCHelper.h">
       </File>