Changeset 1d9338a in nscp

Timestamp:

05/23/05 21:24:32 (8 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

6654022

Parents:

af5bc4b

Message:

2005-05-23 MickeM

+ Added obfuscated password support
+ Added some more debug info on commands (returncode, and input args)
+ Added some more comments ot the NSC.ini
+ Added central password "override"
+ Added central "host override"
+ Fixed bug with external commands always getting WARNING state

2005-05-22 MickeM

+ Added debug outout for command
+ Added timestamps for log-to-file (date_mask to configure format)
+ Added support for "no password" with check_nt
+ Added log of bad password on NSClient requests.

• Some threading issues fixed (I hate threading :)

Files:

• NSClient++.cpp (modified) (18 diffs)
• NSClient++.h (modified) (4 diffs)
• NSClient++.vcproj (modified) (3 diffs)
• changelog (modified) (3 diffs)
• docs/CheckDisk/index.html (modified) (5 diffs)
• docs/CheckEventLog/index.html (modified) (2 diffs)
• docs/CheckHelpers/index.html (modified) (8 diffs)
• docs/CheckSystem/index.html (modified) (5 diffs)
• docs/Configuration/index.html (modified) (9 diffs)
• docs/FileLogger/index.html (modified) (1 diff)
• docs/NRPEListener/index.html (modified) (1 diff)
• docs/SysTray/index.html (modified) (1 diff)
• docs/index.html (modified) (1 diff)
• docs/nscplus.css (modified) (1 diff)
• docs/welcome.html (modified) (4 diffs)
• include/Mutex.h (modified) (1 diff)
• include/NSCAPI.h (modified) (2 diffs)
• include/NSCHelper.cpp (modified) (4 diffs)
• include/NSCHelper.h (modified) (2 diffs)
• include/PDHCollectors.h (modified) (2 diffs)
• include/PDHCounter.h (modified) (2 diffs)
• include/Socket.cpp (modified) (1 diff)
• include/Socket.h (modified) (11 diffs)
• include/b64/b64.c (added)
• include/b64/b64.h (added)
• include/b64/b64.hpp (added)
• include/config.h (modified) (4 diffs)
• include/thread.h (modified) (7 diffs)
• modules/CheckDisk/CheckDisk.cpp (modified) (2 diffs)
• modules/CheckSystem/CheckSystem.cpp (modified) (9 diffs)
• modules/CheckSystem/PDHCollector.cpp (modified) (6 diffs)
• modules/CheckSystem/PDHCollector.h (modified) (1 diff)
• modules/FileLogger/FileLogger.cpp (modified) (4 diffs)
• modules/FileLogger/FileLogger.h (modified) (2 diffs)
• modules/NRPEListener/NRPEListener.cpp (modified) (3 diffs)
• modules/NSClientListener/NSClientListener.cpp (modified) (3 diffs)

NSClient++.cpp

@@ -19 +19 @@
 #include <charEx.h>
 #include <Socket.h>
+#include <b64/b64.h>
+
 
 NSClient mainClient;  // Global core instance.
@@ -55 +57 @@
         return -1;
       }
+    } else if ( _stricmp( "encrypt", argv[1]+1 ) == 0 ) {
+      g_bConsoleLog = true;
+      std::string password;
+      Settings::getInstance()->setFile(mainClient.getBasePath() + "NSC.ini");
+      std::cout << "Enter password to encrypt (has to be a single word): ";
+      std::cin >> password;
+      std::string xor_pwd = Encrypt(password);
+      std::cout << "obfuscated_password=" << xor_pwd << std::endl;
+      if (password != Decrypt(xor_pwd)) 
+        std::cout << "ERROR: Password did not match!" << std::endl;
+      Settings::destroyInstance();
+      return 0;
     } else if ( _stricmp( "start", argv[1]+1 ) == 0 ) {
       g_bConsoleLog = true;
@@ -70 +84 @@
     } else if ( _stricmp( "test", argv[1]+1 ) == 0 ) {
 #ifdef _DEBUG
+      /*
       strEx::run_test_getToken();
       strEx::run_test_replace();
       charEx::run_test_getToken();
       arrayBuffer::run_testArrayBuffer();
+      */
 #endif
 
@@ -92 +108 @@
       }
       mainClient.TerminateService();
-      LOG_MESSAGE("DONE!");
-
       return 0;
     } else {
@@ -137 +151 @@
   try {
     mainClient.unloadPlugins();
-    LOG_DEBUG("Plugins unloaded...");
   } catch(NSPluginException *e) {
     std::cout << "Exception raised: " << e->error_ << " in module: " << e->file_ << std::endl;;
@@ -179 +192 @@
     return;
   }
-  /*
-  MutexLock lock(pluginMutex);
-  if (!lock.hasMutex()) {
-    LOG_ERROR("FATAL ERROR: Could not get mutex.");
-    return;
-  }
-  */
   std::list<std::string>::const_iterator it;
   for (it = plugins.begin(); it != plugins.end(); ++it) {
@@ -201 +207 @@
       return;
     }
-    /*  MutexLock lock(pluginMutex,20000);
-    if (!lock.hasMutex()) {
-    LOG_ERROR("FATAL ERROR: Could not get mutex.");
-    return;
-    }
-    */
     commandHandlers_.clear();
-    {
-      /*    MutexLock lock(messageMutex,20000);
-      if (!lock.hasMutex()) {
-      LOG_ERROR("FATAL ERROR: Could not get mutex (we will now crash BTW).");
-      } else {
-      messageHandlers_.clear();
-      }
-      */
-      messageHandlers_.clear();
-    }
+    messageHandlers_.clear();
   }
   {
@@ -231 +222 @@
     }
   }
-
   {
     WriteLock writeLock(&m_mutexRW, true, 10000);
@@ -259 +249 @@
  */
 void NSClientT::addPlugin(plugin_type plugin) {
-  {
-    ReadLock readLock(&m_mutexRW, true, 5000);
-    if (!readLock.IsLocked()) {
-      LOG_ERROR("FATAL ERROR: Could not get read-mutex.");
-      return;
-    }
-    plugin->load();
-  }
-  /*
-  MutexLock lock(pluginMutex);
-  if (!lock.hasMutex()) {
-    LOG_ERROR("FATAL ERROR: Could not get mutex.");
-    return;
-  }
-  */
-
+  plugin->load();
   {
     WriteLock writeLock(&m_mutexRW, true, 10000);
@@ -298 +273 @@
   NSCAPI::nagiosReturn ret = injectRAW(command.c_str(), aLen, aBuf, mBuf, 1023, pBuf, 1023);
   arrayBuffer::destroyArrayBuffer(aBuf, aLen);
-  if ( (ret == NSCAPI::returnInvalidBufferLen) || (ret == NSCAPI::returnIgnored) )
+  if ( (ret == NSCAPI::returnInvalidBufferLen) || (ret == NSCAPI::returnIgnored) ) {
+    delete [] mBuf;
+    delete [] pBuf;
     return ret;
+  }
   msg = mBuf;
   perf = pBuf;
@@ -320 +298 @@
  */
 NSCAPI::nagiosReturn NSClientT::injectRAW(const char* command, const unsigned int argLen, char **argument, char *returnMessageBuffer, unsigned int returnMessageBufferLen, char *returnPerfBuffer, unsigned int returnPerfBufferLen) {
+  if (logDebug()) {
+    LOG_DEBUG_STD("Injecting: " + (std::string) command + ": " + arrayBuffer::arrayBuffer2string(argument, argLen, ", "));
+  }
   ReadLock readLock(&m_mutexRW, true, 5000);
   if (!readLock.IsLocked()) {
@@ -325 +306 @@
     return NSCAPI::returnUNKNOWN;
   }
-/*  MutexLock lock(pluginMutex);
-  if (!lock.hasMutex()) {
-    LOG_ERROR_STD("Failed to get mutex (" + strEx::itos(lock.getWaitResult()) + "), command ignored...");
-    return NSCAPI::returnUNKNOWN;
-  }
-*/
   for (pluginList::size_type i = 0; i < commandHandlers_.size(); i++) {
     try {
@@ -344 +319 @@
         case NSCAPI::returnCRIT:
         case NSCAPI::returnUNKNOWN:
-//          LOG_DEBUG_STD("Injected Result: " +(std::string) returnMessageBuffer);
-//          LOG_DEBUG_STD("Injected Performance Result: " +(std::string) returnPerfBuffer);
+          LOG_DEBUG_STD("Injected Result: " + NSCHelper::translateReturn(c) + "  --  " + (std::string)(returnMessageBuffer));
+          LOG_DEBUG_STD("Injected Performance Result: " +(std::string) returnPerfBuffer);
           return c;
         default:
@@ -359 +334 @@
   return NSCAPI::returnIgnored;
 }
+
+bool NSClientT::logDebug() {
+  if (g_bConsoleLog)
+    return true;
+  typedef enum status {unknown, debug, nodebug };
+  static status d = unknown;
+  if (d == unknown) {
+    if (Settings::getInstance()->getInt("log", "debug", 0) == 1)
+      d = debug;
+    else
+      d = nodebug;
+  }
+  return (d == debug);
+}
+
 /**
  * Report a message to all logging enabled modules.
@@ -379 +369 @@
     return;
   }
-  /*
-  MutexLock lock(messageMutex);
-  if (!lock.hasMutex()) {
-    std::cout << "Message was lost as the core was locked..." << std::endl;
-    std::cout << message << std::endl;
-    return;
-  }
-  */
   if (g_bConsoleLog) {
     std::string k = "?";
@@ -408 +390 @@
     std::cout << k << " " << file << "(" << line << ") " << message << std::endl;
   }
-  if (msgType == NSCAPI::debug) {
-    typedef enum status {unknown, debug, nodebug };
-    static status d = unknown;
-    if (d == unknown) {
-      if (Settings::getInstance()->getInt("log", "debug", 0) == 1)
-        d = debug;
-      else
-        d = nodebug;
-    }
-    if (d == nodebug)
-      return;
+  if ((msgType == NSCAPI::debug)&&(!logDebug())) {
+    return;
   }
   for (pluginList::size_type i = 0; i< messageHandlers_.size(); i++) {
@@ -480 +453 @@
 }
 
+NSCAPI::boolReturn NSAPICheckLogMessages(int messageType) {
+  if (mainClient.logDebug())
+    return NSCAPI::istrue;
+  return NSCAPI::isfalse;
+}
+
+std::string Encrypt(std::string str, unsigned int algorithm) {
+  unsigned int len = 0;
+  NSAPIEncrypt(algorithm, str.c_str(), str.size(), NULL, &len);
+  len+=2;
+  char *buf = new char[len+1];
+  NSCAPI::errorReturn ret = NSAPIEncrypt(algorithm, str.c_str(), str.size(), buf, &len);
+  if (ret == NSCAPI::isSuccess) {
+    std::string ret = buf;
+    delete [] buf;
+    return ret;
+  }
+  return "";
+}
+std::string Decrypt(std::string str, unsigned int algorithm) {
+  unsigned int len = 0;
+  NSAPIDecrypt(algorithm, str.c_str(), str.size(), NULL, &len);
+  len+=2;
+  char *buf = new char[len+1];
+  NSCAPI::errorReturn ret = NSAPIDecrypt(algorithm, str.c_str(), str.size(), buf, &len);
+  if (ret == NSCAPI::isSuccess) {
+    std::string ret = buf;
+    delete [] buf;
+    return ret;
+  }
+  return "";
+}
+
+NSCAPI::errorReturn NSAPIEncrypt(unsigned int algorithm, const char* inBuffer, unsigned int inBufLen, char* outBuf, unsigned int *outBufLen) {
+  if (algorithm != NSCAPI::xor) {
+    LOG_ERROR("Unknown algortihm requested.");
+    return NSCAPI::hasFailed;
+  }
+  std::string s = inBuffer;
+  std::string key = Settings::getInstance()->getString(MAIN_SECTION_TITLE, MAIN_MASTERKEY, MAIN_MASTERKEY_DEFAULT);
+  char *c = new char[inBufLen+1];
+  strncpy(c, inBuffer, inBufLen);
+  for (int i=0,j=0;i<inBufLen;i++,j++) {
+    if (j > key.size())
+      j = 0;
+    c[i] ^= key[j];
+  }
+  unsigned int len = b64::b64_encode(reinterpret_cast<void*>(c), inBufLen, outBuf, *outBufLen);
+  delete [] c;
+  if (outBuf) {
+    if ((len == 0)||(len >= *outBufLen)) {
+      LOG_ERROR("Invalid out buffer length.");
+      return NSCAPI::isInvalidBufferLen;
+    }
+    outBuf[len] = 0;
+    *outBufLen = len;
+  } else {
+    *outBufLen = len;
+  }
+  return NSCAPI::isSuccess;
+}
+
+NSCAPI::errorReturn NSAPIDecrypt(unsigned int algorithm, const char* inBuffer, unsigned int inBufLen, char* outBuf, unsigned int *outBufLen) {
+  if (algorithm != NSCAPI::xor) {
+    LOG_ERROR("Unknown algortihm requested.");
+    return NSCAPI::hasFailed;
+  }
+  unsigned int len =  b64::b64_decode(inBuffer, inBufLen, reinterpret_cast<void*>(outBuf), *outBufLen);
+  if (outBuf) {
+    if ((len == 0)||(len >= *outBufLen)) {
+      LOG_ERROR("Invalid out buffer length.");
+      return NSCAPI::isInvalidBufferLen;
+    }
+    std::string key = Settings::getInstance()->getString(MAIN_SECTION_TITLE, MAIN_MASTERKEY, MAIN_MASTERKEY_DEFAULT);
+    for (int i=0,j=0;i<len;i++,j++) {
+      if (j > key.size())
+        j = 0;
+      outBuf[i] ^= key[j];
+    }
+    outBuf[len] = 0;
+    *outBufLen = len;
+  } else {
+    *outBufLen = len;
+  }
+  return NSCAPI::isSuccess;
+}
 
 LPVOID NSAPILoader(char*buffer) {
@@ -500 +559 @@
   if (stricmp(buffer, "NSAPIGetBasePath") == 0)
     return &NSAPIGetBasePath;
+  if (stricmp(buffer, "NSAPICheckLogMessages") == 0)
+    return &NSAPICheckLogMessages;
+  if (stricmp(buffer, "NSAPIEncrypt") == 0)
+    return &NSAPIEncrypt;
+  if (stricmp(buffer, "NSAPIDecrypt") == 0)
+    return &NSAPIDecrypt;
   return NULL;
 }

NSClient++.h

@@ -44 +44 @@
   std::string basePath;
   MutexHandler internalVariables;
-//  MutexHandler pluginMutex;
   MutexHandler messageMutex;
   MutexRW  m_mutexRW;
@@ -72 +71 @@
   void unloadPlugins(void);
 
+  bool logDebug();
+
 private:
   void addPlugin(plugin_type plugin);
@@ -78 +79 @@
 
 typedef NTService<NSClientT> NSClient;
+
+
+std::string Encrypt(std::string str, unsigned int algorithm = NSCAPI::xor);
+std::string Decrypt(std::string str, unsigned int algorithm = NSCAPI::xor);
 
 //////////////////////////////////////////////////////////////////////////
@@ -95 +100 @@
 NSCAPI::nagiosReturn NSAPIInject(const char* command, const unsigned int argLen, char **argument, char *returnMessageBuffer, unsigned int returnMessageBufferLen, char *returnPerfBuffer, unsigned int returnPerfBufferLen);
 NSCAPI::errorReturn NSAPIGetSettingsSection(const char*, char***, unsigned int *);
+NSCAPI::boolReturn NSAPICheckLogMessages(int messageType);
+NSCAPI::errorReturn NSAPIEncrypt(unsigned int algorithm, const char* inBuffer, unsigned int inBufLen, char* outBuf, unsigned int *outBufLen);
+NSCAPI::errorReturn NSAPIDecrypt(unsigned int algorithm, const char* inBuffer, unsigned int inBufLen, char* outBuf, unsigned int *outBufLen);
 //////////////////////////////////////////////////////////////////////////
 // Log macros to simplify logging

NSClient++.vcproj

@@ -174 +174 @@
       <Tool
         Name="VCCustomBuildTool"
-        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;
+        CommandLine="echo Copying dependency DLLs
+cmd /c &quot;xcopy /Q /Y $(InputDir)\dist_dll\*.dll $(InputDir)\Dist\&quot;
 echo Removing old archive
 cmd /c &quot;del $(InputDir)\Dist\$(InputName).zip&quot;
+echo Copying documenation
+mkdir $(TargetDir)\docs
+xcopy /s /e /c /q /y $(InputDir)\docs $(TargetDir)\docs
 echo Making archive
 7z.exe a -r -tzip -bd $(InputDir)\Dist\$(InputName).zip $(InputDir)\Dist\*
@@ -234 +235 @@
       </File>
       <File
+        RelativePath=".\include\b64\b64.c">
+        <FileConfiguration
+          Name="Release|Win32">
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"/>
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Debug|Win32">
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"/>
+        </FileConfiguration>
+        <FileConfiguration
+          Name="Distribution|Win32">
+          <Tool
+            Name="VCCLCompilerTool"
+            UsePrecompiledHeader="0"/>
+        </FileConfiguration>
+      </File>
+      <File
         RelativePath=".\include\NSCHelper.cpp">
       </File>
       <File
         RelativePath=".\NSClient++.cpp">
-      </File>
-      <File
-        RelativePath=".\NSClient++.def">
       </File>
       <File
@@ -362 +381 @@
         </FileConfiguration>
         <FileConfiguration
-          Name="Distribution|Win32">
+          Name="Distribution|Win32"
+          ExcludedFromBuild="TRUE">
           <Tool
             Name="VCCustomBuildTool"

changelog

@@ +1 @@
+2005-05-23 MickeM
+ + Added obfuscated password support
+ + Added some more debug info on commands (returncode, and input args)
+ + Added some more comments  ot the NSC.ini
+ + Added central password "override"
+ + Added central "host override"
+ + Fixed bug with external commands always getting WARNING state
+
+2005-05-22 MickeM
+ + Added debug outout for command
+ + Added timestamps for log-to-file (date_mask to configure format)
+ + Added support for "no password" with check_nt
+ + Added log of bad password on NSClient requests.
+ * Some threading issues fixed (I hate threading :)
+
+2005-05-19 MickeM
+ * Verified NT4 compatibility
+
 2005-05-18 MickeM
  * Fixed bug in NSC.ini (section title for Check System was wrong)
- + Added multitasking for plugins (now two plugins can handle requests simultaniously)
- * Fixed som minor issues here and there
+ + Added multitasking for plug-ins (now two plug-ins can handle requests simultaneously)
+ * Fixed some minor issues here and there
 
 2005-05-15 MickeM
@@ -13 +31 @@
  + Added support for Volumes (CheckDisk)
  + Added support for checking all drives of a certain kind
- + Added support for altering filter (makes it posible to check removale drives)
- + Created webpage and better documentation
+ + Added support for altering filter (makes it possible to check removable drives)
+ + Created web page and better documentation
 
 2005-04-20 MickeM
- + Added multitasking to socket listsner (it can now handle multiple connections)
+ + Added multitasking to socket listener (it can now handle multiple connections)
  * Fixed bug in NSClientListener now "seqv" in check_nt shouldn't happen.
  + Added COUNTER support to NSClient and CheckSystem
@@ -23 +41 @@
 2005-04-19 MickeM
  + Added SSL support
- + Added alot of new options
+ + Added a lot of new options
  + Added documentation
  * Renamed and restructured NSCLientCompat to CheckSystem

docs/CheckDisk/index.html

@@ -1 +1 @@
 <html>
-
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
 <title>CheckDisk</title>
 <link rel="stylesheet" type="text/css" href="../nscplus.css">
+<base target="_self">
 </head>
 
@@ -12 +12 @@
   <h1>CheckDisk.dll</h1>
   <p>The CheckDisk module has various disk related checks currently focusing on 
-  size. But hopefully it will be extended with date existance and many other disk 
-  related checks in the furture. Feel free to request checks that you need.</p>
+  size. But hopefully it will be extended with date existence and many other disk 
+  related checks in the future. Feel free to request checks that you need.</p>
   <table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" id="table4">
     <tr>
@@ -91 +91 @@
   </table>
   <p>The “Size with optional postfix” is a way to simply specify large sizes by 
-  adding unit postfix. The avalible postfixes are B for Byte, K for KiloByte, 
-  M for MegaByte and finally G for GigaByte. </p>
+  adding unit postfix. The available postfixes are B for Byte, K for Kilobyte, 
+  M for Megabyte and finally G for Gigabyte. </p>
   <h3>Examples</h3>
   <div class="example">
     <ul>
       <li>
-      <p>Check the size of the windows directory and make sure it stays 
-      below 1 gigabyte:</p>
+      <p><b>Check the size of the windows directory and make sure it stays below 
+      1 gigabyte:</b></p>
       <p><code>CheckFileSize ShowAll MaxWarn=1024M MaxCrit=4096M File:WIN=c:\WINDOWS\*.*</code></p>
       <p><code>WARNING: WIN: 2G (2325339822B)|WIN=2325339822;1073741824;4294967296</code></p>
-      </li>
-      <li>
-      <p>Check the size of the pagefile.sys and make sure it stays 
-      above 1 gigabyte:</p>
+      <div class="config">
+        <p>define command { </p>
+        <p>&nbsp;&nbsp;&nbsp; command_name CheckFileSize </p>
+        <p>&nbsp;&nbsp;&nbsp; command_line check_nrpe -H $HOSTADDRESS$ -p 
+        5666 -c CheckFileSize -a ShowAll MaxWarn=$ARG1$ MaxCrit=$ARG2$ 
+        File:$ARG4$=$ARG5$ </p>
+        <p>}</p>
+        <p>&nbsp;&nbsp;&nbsp; check_command CheckFileSize!1024M!4096M!WIN!c:\WINDOWS\*.*
+        </p>
+      </div>
+      </li>
+      <li>
+      <p><b>Check the size of the pagefile.sys and make sure it stays 
+      above 1 gigabyte:</b></p>
       <p><code>CheckFileSize ShowAll MinWarn=1G MinCrit=512M File=c:\pagefile.sys</code></p>
       <p><code>OK: c:\pagefile.sys: 1G (1610612736B)</code></p>
+      <div class="config">
+        <p>define command { </p>
+        <p>&nbsp;&nbsp;&nbsp; command_name CheckPageFile </p>
+        <p>&nbsp;&nbsp;&nbsp; command_line check_nrpe -H $HOSTADDRESS$ -p 
+        5666 -c CheckFileSize -a ShowAll MinWarn=$ARG1$ MinCrit=$ARG2$ 
+        File:PageFile=c:\pagefile.sys </p>
+        <p>}</p>
+        <p>&nbsp;&nbsp;&nbsp; check_command CheckPageFile!1G!512M</p>
+      </div>
       </li>
     </ul>
@@ -161 +180 @@
       <td valign="top">FIXED, CDROM, REMOVABLE</td>
       <td valign="top">Filter for drive type to prevent checking drives of 
-      certain kinds (most useful when using CheckAll). The default is 
-      FIXED</td>
+      certain kinds (most useful when using CheckAll). The default is FIXED</td>
     </tr>
     <tr>
@@ -171 +189 @@
   </table>
   <p>The “Size with optional postfix” is a way to simply specify large sizes by 
-  adding unit postfix. The availible postfixes are B for Byte, K for KiloByte, 
-  M for MegaByte, G for GigaByte and finally % for percent free space. </p>
+  adding unit postfix. The available postfixes are B for Byte, K for Kilobyte, 
+  M for Megabyte, G for Gigabyte and finally % for percent free space. </p>
   <h3>Examples</h3>
   <div class="example">
     <ul>
       <li>
-      <p>Check the size of C:\ and make sure it has 50% free space:</p>
-      <p><code>CheckDriveSize ShowAll MaxWarn=50% MaxWarn=75% Drive=c:\</code></p>
+      <p><b>Check the size of C:\ and make sure it has 50% free space:</b></p>
+      <p><code>CheckDriveSize ShowAll MaxWarn=50% MaxCrit=75% Drive=c:\</code></p>
       <p><code>OK: c:: 63G (68374007808B)|c:=85% 50;75;</code></p>
-      </li>
-      <li>
-      <p>To check the size of mounted volume c:\volumne_test and make sure it has 1M free space</p>
-      <p><code>CheckDriveSize ShowAll MaxWarn=1M MaxCrit=2M Drive="c:\\volumne_test\\"</code></p>
+      <div class="config">
+        <p>define command { </p>
+        <p>&nbsp;&nbsp;&nbsp; command_name CheckDriveSize </p>
+        <p>&nbsp;&nbsp;&nbsp; command_line check_nrpe -H $HOSTADDRESS$ -p 
+        5666 -c CheckDriveSize -a Drive=$ARG1$ ShowAll MaxWarn=$ARG2$ 
+        MaxCrit=$ARG3$ </p>
+        <p>}</p>
+        <p>&nbsp;&nbsp;&nbsp; check_command CheckDriveSize!C:\!50%!75%</p>
+      </div>
+      </li>
+      <li>
+      <p><b>To check the size of mounted volume c:\volumne_test and make sure 
+      it has 1M free space</b></p>
+      <p><code>CheckDriveSize ShowAll MaxWarn=1M MaxCrit=2M Drive=&quot;c:\\volumne_test\\&quot;</code></p>
       <p><code>CRITICAL: c:\volumne_test\: 3M (4193280B)|c:\volumne_test\=4193280;0;0;</code></p>
-      </li>
-      <li>
-      <p>To check the size of all fixed and network drives and make sure they are at least 50% full</p>
-      <p><code>CheckDriveSize -a MinWarn=50% MinCrit=25% CheckAll FilterType=FIXED FilterType=REMOTE</code></p>
-      <p><code>WARNING: X:\: 28% < warning|C:\=84% 50%;25%; X:\=28% 50%;25%; Y:\=98% 50%;25%;</code></p>
+      <div class="config">
+        <p>&nbsp;&nbsp;&nbsp; check_command CheckDriveSize!<code>c:\volumne_test\</code>!1M!2M</p>
+      </div>
+      </li>
+      <li>
+      <p><b>To check the size of all fixed and network drives and make sure they 
+      are at least 50% full</b></p>
+      <p><code>CheckDriveSize -a MinWarn=50% MinCrit=25% CheckAll FilterType=FIXED 
+      FilterType=REMOTE</code></p>
+      <p><code>WARNING: X:\: 28% &lt; warning|C:\=84% 50%;25%; X:\=28% 50%;25%; 
+      Y:\=98% 50%;25%;</code></p>
+      <div class="config">
+        <p>define command { </p>
+        <p>&nbsp;&nbsp;&nbsp; command_name CheckAllDrives </p>
+        <p>&nbsp;&nbsp;&nbsp; command_line check_nrpe -H $HOSTADDRESS$ -p 
+        5666 -c CheckDriveSize -a Drive=$ARG1$ CheckAll FilterType=FIXED 
+      FilterType=REMOTE MinWarn=$ARG1$ MinCrit=$ARG2$ </p>
+        <p>}</p>
+        <p>&nbsp;&nbsp;&nbsp; check_command CheckAllDrives!25%!50%</p>
+      </div>
       </li>
     </ul>
   </div>
 </div>
+
 </body>
 

docs/CheckEventLog/index.html

@@ -1 +1 @@
 <html>
-
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<meta http-equiv="Content-Language" content="en-us">
 <title>CheckEventLog</title>
 <link rel="stylesheet" type="text/css" href="../nscplus.css">
+<base target="_self">
 </head>
 
@@ -28 +29 @@
   <p>Yet to be written</p>
   <p>A quick introduction though:</p>
-  <p>First option is the logfile to parse. (Application, System etc)</p>
+  <p>First option is the log file to parse. (Application, System etc)</p>
   <p>Options have the following format.</p>
   <p>warn.require.eventType=warning</p>

docs/CheckHelpers/index.html

@@ -3 +3 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<meta http-equiv="Content-Language" content="en-us">
 <title>CheckDisk</title>
 <link rel="stylesheet" type="text/css" href="../nscplus.css">
+<base target="_self">
 </head>
 
@@ -20 +22 @@
     <tr>
       <td valign="top">CheckAlwaysOK</td>
-      <td valign="top">Alter the retun code of another check to always return 
+      <td valign="top">Alter the return code of another check to always return 
       OK.</td>
     </tr>
     <tr>
       <td valign="top">CheckAlwaysCRITICAL</td>
-      <td valign="top">Alter the retun code of another check to always return 
+      <td valign="top">Alter the return code of another check to always return 
       CRITICAL.</td>
     </tr>
     <tr>
       <td valign="top">CheckAlwaysWARNING</td>
-      <td valign="top">Alter the retun code of another check to always return 
+      <td valign="top">Alter the return code of another check to always return 
       WARNING.</td>
     </tr>
     <tr>
       <td valign="top">CheckMultiple</td>
-      <td valign="top">Runs multiple checks and returns the worsta state. 
-      Usefull for minimizing network traffic and command defenitions.</td>
+      <td valign="top">Runs multiple checks and returns the worst state. Useful 
+      for minimizing network traffic and command definitions.</td>
     </tr>
   </table>
@@ -42 +44 @@
   <p><i>This module has no configuration directives.</i></p>
   <h2>CheckAlwaysOK</h2>
-  <p>Runs another check and aters the return state to always return OK.</p>
+  <p>Runs another check and alters the return state to always return OK.</p>
   <table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" id="table5">
     <tr>
@@ -73 +75 @@
   </div>
   <h2>CheckAlwaysCRITICAL</h2>
-  <p>Runs another check and ater the return state to always return CRITICAL.</p>
+  <p>Runs another check and alters the return state to always return CRITICAL.</p>
   <table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" id="table5">
     <tr>
@@ -104 +106 @@
   </div>
   <h2>CheckAlwaysWARNING</h2>
-  <p>Runs another check and ater the return state to always return WARNING.</p>
+  <p>Runs another check and alter the return state to always return WARNING.</p>
   <table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" id="table5">
     <tr>
@@ -135 +137 @@
   </div>
   <h2>CheckMultiple</h2>
-  <p>Runs multiple checks and returns the worst state. It allows you to check an entire system in one go.</p>
+  <p>Runs multiple checks and returns the worst state. It allows you to check 
+  an entire system in one go.</p>
   <table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" id="table5">
     <tr>
@@ -145 +148 @@
       <td valign="top">command</td>
       <td valign="top">The command to run</td>
-      <td valign="top">A command to execute, you can have any number of 
-      this option.</td>
+      <td valign="top">A command to execute, you can have any number of this 
+      option.</td>
     </tr>
   </table>
@@ -153 +156 @@
     <ul>
       <li>
-      <p>Run two checks (CheckDriveSize and ChEckMeM) and return the worst state. Performance data and 
-      message is collected and concatenated.</p>
-      <p><code>CheckMultiple command=CheckDriveSize MaxWarn=1M MaxCrit=2M Drive=c:\\volumne_test\\ command=ChEckMeM MaxWarn=80% MaxCrit=90%</code></p>
-      <p><code>CRITICAL: c:\volumne_test\: 3M (4193280B) > critical, OK memory within bounds.|c:\volumne_test\=4193280;1024K (1048576B);2M (2097152B); page=31% 80%;90%;</code></p>
+      <p>Run two checks (CheckDriveSize and ChEckMeM) and return the worst 
+      state. Performance data and message is collected and concatenated.</p>
+      <p><code>CheckMultiple command=CheckDriveSize MaxWarn=1M MaxCrit=2M 
+      Drive=c:\\volumne_test\\ command=ChEckMeM MaxWarn=80% MaxCrit=90%</code></p>
+      <p><code>CRITICAL: c:\volumne_test\: 3M (4193280B) &gt; critical, OK memory 
+      within bounds.|c:\volumne_test\=4193280;1024K (1048576B);2M (2097152B); 
+      page=31% 80%;90%;</code></p>
       </li>
     </ul>

docs/CheckSystem/index.html

@@ -3 +3 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<meta http-equiv="Content-Language" content="en-us">
 <title>CheckSystem</title>
 <link rel="stylesheet" type="text/css" href="../nscplus.css">
@@ -42 +43 @@
   <p>This module needs configuration as PDH counters are version and language 
   specific. This means that unless you use an English language windows 2000 you 
-  will most likely have to edit this. There is also some other tweks that can 
+  will most likely have to edit this. There is also some other tweaks that can 
   be configured such as check resolution and buffer size. For more details on 
   how to configure this refer to the Configuration section.</p>
@@ -158 +159 @@
     <ul>
       <li>
-      <p>Check that the system has been running for atleast a day:</p>
+      <p>Check that the system has been running for at least a day:</p>
       <p><code>checkUpTime warn=1d crit=12h</code></p>
       <p><code>Client has uptime (19h) &lt; warning (24h)</code></p>
@@ -303 +304 @@
   counters use the program perfmon that is shipped with windows. An important 
   note is that performance counters are language and version specific.</p>
+  <p><i><b>This is currently broken and will be fixed in the next version.</b></i></p>
   <table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" id="table16">
     <tr>
@@ -346 +348 @@
     <tr>
       <td valign="top">Counter:&lt;name&gt;</td>
-      <td valign="top">Perfomance Counter</td>
+      <td valign="top">Performance Counter</td>
       <td valign="top">Add a named performance counter. The &lt;name&gt; will be 
       used as an alias.</td>

docs/Configuration/index.html

@@ -3 +3 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<meta http-equiv="Content-Language" content="en-us">
 <title>Configuration</title>
 <link rel="stylesheet" type="text/css" href="../nscplus.css">
@@ -23 +24 @@
   has a lot of examples and comments so make sure you change this before you use 
   NSClient++ as some of the examples might be potential security issues.</p>
+  <h2>[Settings]</h2>
+  <p>This section has options for how logging is performed. First off notice that 
+  for logging to make sense you need to enable the “FileLogger.dll” module that 
+  logs all log data to a text file in the same directory as the NSClient++ binary 
+  if you don’t enable any logging module nothing will be logged.</p>
+  <p>The options you have available here are</p>
+  <table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" id="table21">
+    <tr>
+      <td valign="top">Option</td>
+      <td valign="top">Default value</td>
+      <td valign="top">Description</td>
+    </tr>
+    <tr>
+      <td valign="top">obfuscated_password</td>
+      <td valign="top">...</td>
+      <td valign="top">An obfuscated version of password. For more details 
+      refer to the password option below.</td>
+    </tr>
+    <tr>
+      <td valign="top">password</td>
+      <td valign="top">...</td>
+      <td valign="top">The password used by various (presently only 
+      NSClient) daemons. If no password is set everyone will be able to 
+      use this service remotely.</td>
+    </tr>
+    <tr>
+      <td valign="top">allowed_hosts</td>
+      <td valign="top">127.0.0.1</td>
+      <td valign="top">A list (comma separated) with hosts that are 
+      allowed to connect and query data. If this is empty all hosts will 
+      be allowed to query data.</td>
+    </tr>
+  </table>
   <h2>[Log]</h2>
   <p>This section has options for how logging is performed. First off notice that 
@@ -47 +81 @@
       this is relative to the NSClient++ binary.</td>
     </tr>
+    <tr>
+      <td valign="top">date_mask</td>
+      <td valign="top">%Y-%m-%d %H:%M:%S</td>
+      <td valign="top">The date format used when logging to a file</td>
+    </tr>
   </table>
   <h2>[Systray]</h2>
@@ -79 +118 @@
     </tr>
     <tr>
+      <td valign="top">obfuscated_password</td>
+      <td valign="top">&nbsp;</td>
+      <td valign="top">An obfuscated version of password. For more details 
+      refer to the password option below. </td>
+    </tr>
+    <tr>
       <td valign="top">password</td>
       <td valign="top">&nbsp;</td>
       <td valign="top">The password that incoming client needs to authorize 
-      themselves by.</td>
+      themselves by. This option will replace the one found under Settings 
+      for NSClient. If this is blank the option found under Settings will 
+      be used. If both are blank everyone will be granted access.</td>
     </tr>
     <tr>
@@ -88 +135 @@
       <td valign="top">&nbsp;</td>
       <td valign="top">A list (coma separated) with hosts that are allowed 
-      to poll information from NSClient++</td>
-    </tr>
-    <tr>
-      <td valign="top">use_ssl</td>
-      <td valign="top">0</td>
-      <td valign="top">Boolean value to toggle SSL encryption. This is not 
-      yet supported in any client I know of but as the underlying structure 
-      (NRPE) supports it I thought Id might add it if someone wants to update 
-      check_nt to support SSL.<b>Not implemented in this version</b></td>
-    </tr>
-  </table>
+      to poll information from NSClient++. This will replace the one found 
+      under Setting for NSClient if present. If not present the same 
+      option found under Settings will be used. If both are blank all 
+      hosts will be allowed to access the system</td>
+    </tr>
+    </table>
   <h2>[NRPE]</h2>
   <p>This is configuration for the NRPE module that controls how the NRPE listener 
@@ -117 +159 @@
       <td valign="top">&nbsp;</td>
       <td valign="top">A list (coma separated) with hosts that are allowed 
-      to poll information from NSClient++</td>
+      to poll information from NRPE. This will replace the one found under 
+      Setting for NRPE if present. If not present the same option found 
+      under Settings will be used. If both are blank all hosts will be 
+      allowed to access the system</td>
     </tr>
     <tr>
@@ -129 +174 @@
       <td valign="top">60</td>
       <td valign="top">The maximum time in seconds that a command can execute. 
-      (if more then this execution will be aborted).<b>NOTICE</b> this only 
+      (if more then this execution will be aborted).<b> NOTICE</b> this only 
       affects external commands not internal ones.</td>
     </tr>
@@ -156 +201 @@
   The latter is the preferred way as it is shorter.</p>
   <h2>[Check System]</h2>
-  <p>Here you can set various options to configure the Syetem Check module.</p>
+  <p>Here you can set various options to configure the System Check module.</p>
   <table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" id="table20">
     <tr>
@@ -179 +224 @@
     <tr>
       <td valign="top">CounterPageLimit</td>
-      <td valign="top">\\\\.\\Memory\\Commit Limit</td>
+      <td valign="top">\Memory\Commit Limit</td>
       <td valign="top">Counter to use to check upper memory limit.</td>
     </tr>
     <tr>
       <td valign="top">CounterPage</td>
-      <td valign="top">\\\\.\\Memory\\Committed Bytes</td>
+      <td valign="top">\Memory\Committed Bytes</td>
       <td valign="top">Counter to use to check current memory usage.</td>
     </tr>
     <tr>
       <td valign="top">CounterUptime</td>
-      <td valign="top">\\\\.\\System\\System Up Time</td>
+      <td valign="top">\System\System Up Time</td>
       <td valign="top">Counter to use to check the uptime of the system.</td>
     </tr>
     <tr>
       <td valign="top">CounterCPU</td>
-      <td valign="top">\\\\.\\Processor(_total)\\% Processor Time</td>
-      <td valign="top">Counter to use for CPU load.</td>
+      <td valign="top">\Processor(_total)\% Processor Time</td>
+      <td valign="top">Counter to use for CPU load. For NT4 this has to be 
+      altered to &quot;\System\% Total Processor Time&quot; as PDH definitions have changed.</td>
     </tr>
   </table>

docs/FileLogger/index.html

@@ -3 +3 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<meta http-equiv="Content-Language" content="en-us">
 <title>FileLogger</title>
 <link rel="stylesheet" type="text/css" href="../nscplus.css">

docs/NRPEListener/index.html

@@ -3 +3 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<meta http-equiv="Content-Language" content="en-us">
 <title>NRPEListener</title>
 <link rel="stylesheet" type="text/css" href="../nscplus.css">

docs/SysTray/index.html

@@ -3 +3 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
+<meta http-equiv="Content-Language" content="en-us">
 <title>SysTray</title>
 <link rel="stylesheet" type="text/css" href="../nscplus.css">

docs/index.html

@@ -9 +9 @@
   <frameset cols="212,*">
     <frame name="contents" target="main" src="menu.html" scrolling="no" noresize>
-    <frame name="main" src="welcome.html" scrolling="auto">
+    <frame name="main" src="welcome.html" scrolling="auto" target="_self">
   </frameset>
   <noframes>

docs/nscplus.css

@@ -111 +111 @@
   padding: 5px;
 }
+
+.config {
+  padding: 0px 0px 0px 20px;
+  border: none;
+  background: lightgrey;
+  font-style: italic;
+  clear: both;
+}
+
+
+
+

docs/welcome.html

@@ -1 +1 @@
 <html>
-
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
 <title>About NSClient++</title>
 <link rel="stylesheet" type="text/css" href="nscplus.css">
+<base target="_self">
 </head>
 
@@ -23 +23 @@
 plug-in is of course the most powerful way but requires knowledge of C++ or other 
 language which can produce DLLs and interface with regular C programs.</p>
+<p>As for checking with NSClient++ I would recommend
+<a href="http://sourceforge.net/project/showfiles.php?group_id=26589&package_id=40241">
+NRPE</a> as it is a lot more flexible then check_nt. But NSClient has full 
+support for check_nt and if there is an interest I could probably add support 
+for check_nt from nc_net.</p>
 <h1>News</h1>
 <table id="table17"   border="0" cellspacing="0" cellpadding="0" class="MsoNormalTable" >
   <tr>
-    <td>2005-05-14</td>
+    <td valign="top">2005-05-23</td>
+    <td>New version available.<p>Has many new features and some enhancements 
+    as well as NT4 Compatibility (verified this time).</p>
+    <p>Added:</p>
+    <ul>
+      <li>Multitasking support for requests.</li>
+      <li>NRPE support for checkCounter</li>
+      <li>CheckHelpers module to alter the result of various check and 
+      similar things </li>
+      <li>Support for Volumes (CheckDisk)</li>
+      <li>Support for checking all drives</li>
+      <li>Support for altering filter (makes it possible to check 
+      removable/network drives)</li>
+      <li>Webpage and better documentation</li>
+      <li>Obfuscated password support (try NSClient++ /encrypt)</li>
+      <li>Central host/password options in INI file (look for [Settings])</li>
+    </ul>
+    <p>Enhances/Fixes:</p>
+    <ul>
+      <li>Some threading issues fixed</li>
+      <li>Verified NT4 compatibility</li>
+      <li>Fixed bug in NSC.ini (section title for Check System was wrong)</li>
+      <li>Fixed some minor issues here and there</li>
+      <li>Make check commands ignore case</li>
+      <li>Better debugging log (timestamps, better info, etc)</li>
+      <li>Support for password-less NSClient</li>
+    </ul>
+    </td>
+  </tr>
+  <tr>
+    <td valign="top">2005-05-14</td>
     <td>New webpage is created and semi updated.</td>
   </tr>
@@ -33 +68 @@
 <p>NSClient can be found at its source forge page
 <a href="http://nscplus.sf.net" target="_top">http://nscplus.sf.net</a></p>
-<p>Latest version is <a href="http://prdownloads.sourceforge.net/nscplus/NSClient++-0.1.0-a2.zip?download">NSClient++ 0.1.0 Alpha 2.zip</a> </p>
+<p>Latest version is <a href="http://prdownloads.sourceforge.net/nscplus/NSClient++-0.2.0.zip?download">NSClient++ 0.2.0.zip</a></p>
 <h1>Modules</h1>
 <p>NSClient++ comes with a few modules out of the box that does various checks. 
@@ -104 +139 @@
   <tr>
     <td width="221" colspan="2"><b><a href="CheckHelpers/index.html">CheckHelpers</a></b></td>
-    <td>Various helper function, doesn't check anything it it self but can 
+    <td>Various helper function, doesn't check anything in it self but can 
     help make things simpler.</td>
   </tr>

include/Mutex.h

@@ -101 +101 @@
    */
   MutexLock(HANDLE hMutex, DWORD timeout = 5000L) : bHasMutex(false), hMutex_(hMutex) {
+    if (hMutex_ == NULL)
+      std::cout << "Whops..." << std::endl;
     assert(hMutex_ != NULL);
     dwWaitResult = WaitForSingleObject(hMutex_, timeout);

include/NSCAPI.h

@@ -22 +22 @@
   } errorReturn;
 #else
-  const int returnCRIT = 2;
   const int returnOK = 0;
   const int returnWARN = 1;
+  const int returnCRIT = 2;
   const int returnUNKNOWN = 4;
   const int returnInvalidBufferLen = -2;
@@ -38 +38 @@
 #endif
 
+  const int xor = 1;
 
   // Various message Types

include/NSCHelper.cpp

@@ -107 +107 @@
   lpNSAPIStopServer fNSAPIStopServer = NULL;
   lpNSAPIInject fNSAPIInject = NULL;
+  lpNSAPICheckLogMessages fNSAPICheckLogMessages = NULL;
+  lpNSAPIEncrypt fNSAPIEncrypt = NULL;
+  lpNSAPIDecrypt fNSAPIDecrypt = NULL;
 }
 
@@ -123 +126 @@
  */
 void NSCModuleHelper::Message(int msgType, std::string file, int line, std::string message) {
-  if (fNSAPIMessage) 
+  if (fNSAPIMessage) {
+    if ((msgType == NSCAPI::debug) && (!logDebug()))
+      return;
     return fNSAPIMessage(msgType, file.c_str(), line, message.c_str());
+  }
   else
     std::cout << "NSCore not loaded..." << std::endl << message << std::endl;
@@ -354 +360 @@
   return ret;
 }
+
+
+bool NSCModuleHelper::logDebug() {
+  typedef enum status {unknown, debug, nodebug };
+  static status d = unknown;
+  if (d == unknown) {
+    if (checkLogMessages(debug)== NSCAPI::istrue)
+      d = debug;
+    else
+      d = nodebug;
+  }
+  return (d == debug);
+}
+
+
+
+
+std::string NSCModuleHelper::Encrypt(std::string str, unsigned int algorithm) {
+  if (!fNSAPIEncrypt)
+    throw NSCMHExcpetion("NSCore has not been initiated...");
+  unsigned int len = 0;
+  fNSAPIEncrypt(algorithm, str.c_str(), str.size(), NULL, &len);
+  len+=2;
+  char *buf = new char[len+1];
+  NSCAPI::errorReturn ret = fNSAPIEncrypt(algorithm, str.c_str(), str.size(), buf, &len);
+  if (ret == NSCAPI::isSuccess) {
+    std::string ret = buf;
+    delete [] buf;
+    return ret;
+  }
+  return "";
+}
+std::string NSCModuleHelper::Decrypt(std::string str, unsigned int algorithm) {
+  if (!fNSAPIDecrypt)
+    throw NSCMHExcpetion("NSCore has not been initiated...");
+  unsigned int len = 0;
+  fNSAPIDecrypt(algorithm, str.c_str(), str.size(), NULL, &len);
+  len+=2;
+  char *buf = new char[len+1];
+  NSCAPI::errorReturn ret = fNSAPIDecrypt(algorithm, str.c_str(), str.size(), buf, &len);
+  if (ret == NSCAPI::isSuccess) {
+    std::string ret = buf;
+    delete [] buf;
+    return ret;
+  }
+  return "";
+}
+
+
+bool NSCModuleHelper::checkLogMessages(int type) {
+  if (!fNSAPICheckLogMessages)
+    throw NSCMHExcpetion("NSCore has not been initiated...");
+  return fNSAPICheckLogMessages(type) == NSCAPI::istrue;
+}
 /**
  * Retrieve the application version as a string (in human readable format) from the core.
@@ -416 +476 @@
   NSCModuleHelper::fNSAPIInject = (NSCModuleHelper::lpNSAPIInject)f("NSAPIInject");
   NSCModuleHelper::fNSAPIGetBasePath = (NSCModuleHelper::lpNSAPIGetBasePath)f("NSAPIGetBasePath");
+  NSCModuleHelper::fNSAPICheckLogMessages = (NSCModuleHelper::lpNSAPICheckLogMessages)f("NSAPICheckLogMessages");
+  NSCModuleHelper::fNSAPIDecrypt = (NSCModuleHelper::lpNSAPIDecrypt)f("NSAPIDecrypt");
+  NSCModuleHelper::fNSAPIEncrypt = (NSCModuleHelper::lpNSAPIEncrypt)f("NSAPIEncrypt");
   return NSCAPI::isSuccess;
 }

include/NSCHelper.h

@@ -84 +84 @@
   typedef NSCAPI::nagiosReturn (*lpNSAPIInject)(const char*, const unsigned int, char **, char *, unsigned int, char *, unsigned int);
   typedef LPVOID (*lpNSAPILoader)(char*);
+  typedef NSCAPI::boolReturn (*lpNSAPICheckLogMessages)(int);
+  typedef NSCAPI::errorReturn (*lpNSAPIEncrypt)(unsigned int, const char*, unsigned int, char*, unsigned int *);
+  typedef NSCAPI::errorReturn (*lpNSAPIDecrypt)(unsigned int, const char*, unsigned int, char*, unsigned int *);
 
   // Helper functions for calling into the core
@@ -98 +101 @@
   void StopService(void);
   std::string getBasePath();
+  bool logDebug();
+  bool checkLogMessages(int type);
+  std::string Encrypt(std::string str, unsigned int algorithm = NSCAPI::xor);
+  std::string Decrypt(std::string str, unsigned int algorithm = NSCAPI::xor);
 };
 

include/PDHCollectors.h

@@ -4 +4 @@
 
 namespace PDHCollectors {
-  class StaticPDHCounterListener : public PDH::PDHCounterListener {
+  class StaticPDHCounterListenerInt : public PDH::PDHCounterListener {
     __int64 value_;
   public:
@@ -16 +16 @@
     }
     __int64 getValue() const {
+      return value_;
+    }
+  };
+  class StaticPDHCounterListenerDouble : public PDH::PDHCounterListener {
+    double value_;
+  public:
+    virtual void collect(const PDH::PDHCounter &counter) {
+      setValue(counter.getDoubleValue());
+    }
+    void attach(const PDH::PDHCounter &counter){}
+    void detach(const PDH::PDHCounter &counter){}
+    void setValue(double value) {
+      value_ = value;
+    }
+    double getValue() const {
       return value_;
     }

include/PDHCounter.h

@@ -77 +77 @@
         listener_->collect(*this);
     }
+    double getDoubleValue() const {
+      return data_.doubleValue;
+    }
     __int64 getInt64Value() const {
       return data_.largeValue;
@@ -128 +131 @@
         throw PDHException("PdhCloseQuery failed", status);
       hQuery_ = NULL;
+      for (CounterList::iterator it = counters_.begin(); it != counters_.end(); it++) {
+        delete (*it);
+      }
+      counters_.clear();
     }
 

include/Socket.cpp

@@ -7 +7 @@
  * @param error 
  */
-void simpleSocket::Socket::printError(std::string error) {
-  NSC_LOG_ERROR_STD(error);
+void simpleSocket::Socket::printError(std::string FILE, int LINE, std::string error) {
+  NSCModuleHelper::Message(NSCAPI::error, FILE, LINE, error);
 }
 

include/Socket.h

@@ -18 +18 @@
       return error_;
     }
-    
+
   };
   class DataBuffer {
@@ -150 +150 @@
       return inet_ntoa(from_.sin_addr);
     }
-    virtual void printError(std::string error);
+    virtual void printError(std::string file, int line, std::string error);
   };
 
@@ -161 +161 @@
 
   /**
-   * @ingroup NSClient++
-   * Socket responder class.
-   * This is a background thread that listens to the socket and executes incoming commands.
-   *
-   * @version 1.0
-   * first version
-   *
-   * @date 02-12-2005
-   *
-   * @author mickem
-   *
-   * @par license
-   * This code is absolutely free to use and modify. The code is provided "as is" with
-   * no expressed or implied warranty. The author accepts no liability if it causes
-   * any damage to your computer, causes your pet to fall ill, increases baldness
-   * or makes your car start emitting strange noises when you start it up.
-   * This code has no bugs, just undocumented features!
-   * 
-   * @todo This is not very well written and should probably be reworked.
-   *
-   * @bug 
-   *
-   */
+  * @ingroup NSClient++
+  * Socket responder class.
+  * This is a background thread that listens to the socket and executes incoming commands.
+  *
+  * @version 1.0
+  * first version
+  *
+  * @date 02-12-2005
+  *
+  * @author mickem
+  *
+  * @par license
+  * This code is absolutely free to use and modify. The code is provided "as is" with
+  * no expressed or implied warranty. The author accepts no liability if it causes
+  * any damage to your computer, causes your pet to fall ill, increases baldness
+  * or makes your car start emitting strange noises when you start it up.
+  * This code has no bugs, just undocumented features!
+  * 
+  * @todo This is not very well written and should probably be reworked.
+  *
+  * @bug 
+  *
+  */
   template <class TListenerType = simpleSocket::Socket, class TSocketType = TListenerType>
   class Listener : public TListenerType {
@@ -191 +191 @@
   private:
     struct simpleResponderBundle {
+      bool terminated;
       HANDLE hThread;
       unsigned dwThreadID;
@@ -226 +227 @@
     Listener() : pHandler_(NULL) {};
     virtual ~Listener() {
-      if (responderList_.size() > 0)
-        std::cout << "We had stale processes running then the socket closed." << std::endl;
-      // @todo check if we have stale processes here (if so log an error)
+      if (responderList_.size() > 0) {
+        MutexLock lock(responderMutex_);
+        if (!lock.hasMutex()) {
+          printError(__FILE__, __LINE__, "Failed to get responder mutex (cannot terminate socket threads).");
+        } else {
+          for (socketResponses::iterator it = responderList_.begin(); it != responderList_.end(); ++it) {
+            if (WaitForSingleObject( (*it).hThread, 1000) == WAIT_OBJECT_0) {
+            } else {
+              if (!TerminateThread((*it).hThread, -1)) {
+                printError(__FILE__, __LINE__, "We failed to terminate check thread.");
+              } else {
+                if (WaitForSingleObject( (*it).hThread, 5000) == WAIT_OBJECT_0) {
+                  CloseHandle((*it).hThread);
+                } else {
+                  printError(__FILE__, __LINE__, "We failed to terminate check thread (wait timed out).");
+                }
+              }
+            }
+          }
+          responderList_.clear();
+        }
+      }
     };
 
@@ -255 +275 @@
     };
     void addResponder(tSocket *client) {
+      MutexLock lock(responderMutex_);
+      if (!lock.hasMutex()) {
+        printError(__FILE__, __LINE__, "Failed to get responder mutex.");
+        return;
+      }
+      for (socketResponses::iterator it = responderList_.begin(); it != responderList_.end();) {
+        if ( (*it).terminated) {
+          if (WaitForSingleObject( (*it).hThread, 500) == WAIT_OBJECT_0) {
+            CloseHandle((*it).hThread);
+            responderList_.erase(it++);
+          }
+        } else
+          ++it;
+      }
       simpleResponderBundle data;
-      // @todo protect
       srp_data *lpData = new srp_data;
       lpData->pCore = this;
       lpData->client = client;
 
-      MutexLock lock(responderMutex_);
-      if (!lock.hasMutex()) {
-        printError("Failed to get responder mutex.");
-        return;
-      }
       data.hThread = reinterpret_cast<HANDLE>(::_beginthreadex( NULL, 0, &socketResponceProc, lpData, 0, &data.dwThreadID));
+      data.terminated = false;
       responderList_.push_back(data);
     }
@@ -272 +301 @@
       MutexLock lock(responderMutex_);
       if (!lock.hasMutex()) {
-        printError("Failed to get responder mutex when trying to free thread.");
+        printError(__FILE__, __LINE__, "Failed to get responder mutex when trying to free thread.");
         return false;
       }
       for (socketResponses::iterator it = responderList_.begin(); it != responderList_.end(); ++it) {
         if ( (*it).dwThreadID == dwThreadID) {
-          responderList_.erase(it);
+          (*it).terminated = true;
           return true;
         }
@@ -316 +345 @@
     pCore->onAccept(client);
   } catch (SocketException e) {
-    pCore->printError(e.getMessage() + " killing socket...");
+    pCore->printError(__FILE__, __LINE__, e.getMessage() + " killing socket...");
   }
   client->close();
   delete client;
   if (!pCore->removeResponder(GetCurrentThreadId())) {
-    pCore->printError("Could not remove thread: " + strEx::itos(GetCurrentThreadId()));
+    pCore->printError(__FILE__, __LINE__, "Could not remove thread: " + strEx::itos(GetCurrentThreadId()));
   }
   _endthreadex(0);
@@ -335 +364 @@
   hStopEvent_ = CreateEvent(NULL, TRUE, FALSE, NULL);
   if (!hStopEvent_) {
-    core->printError("Create StopEvent failed: " + strEx::itos(GetLastError()));
+    core->printError(__FILE__, __LINE__, "Create StopEvent failed: " + strEx::itos(GetLastError()));
     return 0;
   }
@@ -352 +381 @@
         }
       } catch (SocketException e) {
-        core->printError(e.getMessage() + ", attempting to resume...");
+        core->printError(__FILE__, __LINE__, e.getMessage() + ", attempting to resume...");
       }
     }
   } catch (SocketException e) {
-    core->printError(e.getMessage());
+    core->printError(__FILE__, __LINE__, e.getMessage());
   }
   core->shutdown(SD_BOTH);
@@ -364 +393 @@
   hStopEvent_ = NULL;
   if (!CloseHandle(hTmp)) {
-    core->printError("CloseHandle StopEvent failed: " + strEx::itos(GetLastError()));
+    core->printError(__FILE__, __LINE__, "CloseHandle StopEvent failed: " + strEx::itos(GetLastError()));
   }
   return 0;

include/config.h

@@ -5 +5 @@
 
 // Version
-#define SZVERSION "0.3.0 a1 2005-05-16"
+#define SZVERSION "0.2.0 2005-05-21"
 
 // internal name of the service
@@ -31 +31 @@
 #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 ""
+#define NSCLIENT_SETTINGS_VERSION "version"
+#define NSCLIENT_SETTINGS_VERSION_DEFAULT "auto"
 
 // NRPE Settings headlines
@@ -41 +39 @@
 #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
@@ -74 +70 @@
 #define LOG_SECTION_TITLE "log"
 #define LOG_FILENAME "file" 
-#define LOG_FILENAME_DEFAULT "nsclient.log" 
+#define LOG_FILENAME_DEFAULT "nsclient.log"
+#define LOG_DATEMASK "date_mask"
+#define LOG_DATEMASK_DEFAULT "%Y-%m-%d %H:%M:%S"
 
+// Main Settings
+#define MAIN_SECTION_TITLE "Settings"
+#define MAIN_MASTERKEY "master_key" 
+#define MAIN_MASTERKEY_DEFAULT "This is a secret key thet you should change"
+#define MAIN_OBFUSCATED_PASWD "obfuscated_password"
+#define MAIN_OBFUSCATED_PASWD_DEFAULT ""
+#define MAIN_SETTINGS_PWD "password"
+#define MAIN_SETTINGS_PWD_DEFAULT ""
+#define MAIN_ALLOWED_HOSTS "allowed_hosts"
+#define MAIN_ALLOWED_HOSTS_DEFAULT "127.0.0.1"

include/thread.h

@@ -7 +7 @@
 public:
   std::string e_;
-  ThreadException(std::string e) : e_(e) {}
+  ThreadException(std::string e) : e_(e) {
+    std::cout << e << std::endl;
+  }
 };
 
@@ -69 +71 @@
         throw ThreadException("Could not retrieve mutex when killing thread, we are fucked...");
       }
-      if (hThread_)
-        CloseHandle(hThread_);
       hThread_ = NULL;
       if (hStopEvent_)
@@ -99 +99 @@
     delete param;
 
-    if (hStopEvent != NULL) {
-      instance->threadProc(lpParam);
-      SetEvent(hStopEvent);
-    }
+    instance->threadProc(lpParam);
     pCore->terminate();
+    SetEvent(hStopEvent);
     _endthread();
   }
@@ -135 +133 @@
     }
     hThread_ = reinterpret_cast<HANDLE>(::_beginthread(threadProc, 0, reinterpret_cast<VOID*>(param)));
-    assert(hThread_ != NULL);
   }
   /**
@@ -153 +150 @@
       assert(hStopEvent_ != NULL);
       pObject_->exitThread();
-      dwWaitResult = WaitForSingleObject(hStopEvent_, delay);
     }
+    dwWaitResult = WaitForSingleObject(hStopEvent_, delay);
     switch (dwWaitResult) {
       // The thread got mutex ownership.
@@ -182 +179 @@
     return pObject_;
   }
-  T* getThread() const {
+  T* getThread() {
     MutexLock mutex(hMutex_, 5000L);
     if (!mutex.hasMutex()) {
@@ -197 +194 @@
     delete pObject_;
     pObject_ = NULL;
-    CloseHandle(hStopEvent_);
-    hStopEvent_ = NULL;
     hThread_ = NULL;
   }

modules/CheckDisk/CheckDisk.cpp

@@ -204 +204 @@
       return NSCAPI::returnUNKNOWN;
     }
+    //10597515264&80015491072
 
     if (bNSClient) {
-      message += strEx::itos(totalNumberOfFreeBytes.QuadPart) + "&";
-      message += strEx::itos(totalNumberOfBytes.QuadPart) + "&";
+      if (!message.empty())
+        message += "&";
+      message += strEx::itos(totalNumberOfFreeBytes.QuadPart);
+      message += "&";
+      message += strEx::itos(totalNumberOfBytes.QuadPart);
     } else {
       std::string tStr;
@@ -236 +240 @@
   if (message.empty())
     message = "All drive sizes are within bounds.";
-  else
+  else if (!bNSClient)
     message = NSCHelper::translateReturn(returnCode) + ": " + message;
   return returnCode;

modules/CheckSystem/CheckSystem.cpp

@@ -297 +297 @@
   NSCAPI::nagiosReturn ret = NSCAPI::returnOK;
   bool bShowAll = false;
+  bool bNSClient = false;
 
   for (arrayBuffer::arrayList::const_iterator it = stl_args.begin(); it != stl_args.end(); ++it) {
@@ -302 +303 @@
     if (t.first == SHOW_ALL)
       bShowAll = true;
+    else if (t.first == NSCLIENT)
+      bNSClient = true;
     else if (t.first == SHOW_FAIL)  {
       bShowAll = false;
@@ -339 +342 @@
   }
   if (msg.empty())
-    msg ="All services ok.";
+    msg ="All services are running.";
+  else if (!bNSClient)
+    msg = NSCHelper::translateReturn(ret) + ": " + msg;
   return ret;
 }
@@ -345 +350 @@
 
 /**
- * Check availible memory and return various check results
+ * Check available memory and return various check results
  * Example: checkMem showAll maxWarn=50 maxCrit=75
  *
@@ -468 +473 @@
   NSCAPI::nagiosReturn ret = NSCAPI::returnOK;
   bool bShowAll = false;
+  bool bNSClient = false;
 
   for (arrayBuffer::arrayList::const_iterator it = stl_args.begin(); it != stl_args.end(); ++it) {
@@ -473 +479 @@
     if (t.first == SHOW_ALL)
       bShowAll = true;
+    else if (t.first == NSCLIENT)
+      bNSClient = true;
     else if (t.first == SHOW_FAIL)  {
       bShowAll = false;
@@ -518 +526 @@
   if (msg.empty())
     msg ="All processes ok.";
+  else if (!bNSClient)
+    msg = NSCHelper::translateReturn(ret) + ": " + msg;
   return ret;
 }
@@ -583 +593 @@
     try {
       PDH::PDHQuery pdh;
-      PDHCollectors::StaticPDHCounterListener counter;
+      PDHCollectors::StaticPDHCounterListenerInt counter;
       std::string name = (*it).first;
       if (name.empty())
@@ -591 +601 @@
       pdh.collect();
       if (bNSCLientCompatible) {
+//        std::cout << counter.getValue() << std::endl;
         msg += strEx::itos(counter.getValue());
       } else {

modules/CheckSystem/PDHCollector.cpp

@@ -36 +36 @@
 
 /**
- * Thread that collects the data every "CHECK_INTERVAL" seconds.
- *
- * @param lpParameter Not used
- * @return thread exit status
- *
- * @author mickem
- *
- * @date 03-13-2004
- *
- * @bug If we have "custom named" counters ?
- * @bug This whole concept needs work I think.
- *
- */
+* Thread that collects the data every "CHECK_INTERVAL" seconds.
+*
+* @param lpParameter Not used
+* @return thread exit status
+*
+* @author mickem
+*
+* @date 03-13-2004
+*
+* @bug If we have "custom named" counters ?
+* @bug This whole concept needs work I think.
+*
+*/
 DWORD PDHCollector::threadProc(LPVOID lpParameter) {
   PDH::PDHQuery pdh;
@@ -103 +103 @@
 
 /**
- * Request termination of the thread (waiting for thread termination is not handled)
- */
+* Request termination of the thread (waiting for thread termination is not handled)
+*/
 void PDHCollector::exitThread(void) {
   MutexLock mutex(mutexHandler);
@@ -116 +116 @@
     if (!SetEvent(hStopEvent_)) {
       NSC_LOG_ERROR_STD("SetStopEvent failed");
-  }
+    }
 }
 /**
- * Get the average CPU usage for "time"
- * @param time Time to check 
- * @return average CPU usage
- */
+* Get the average CPU usage for "time"
+* @param time Time to check 
+* @return average CPU usage
+*/
 int PDHCollector::getCPUAvrage(std::string time) {
   unsigned int mseconds = strEx::stoui_as_time(time, checkIntervall_*100);
@@ -133 +133 @@
 }
 /**
- * Get uptime from counter
- * @bug Do we need to collect this all the time ? (perhaps we can collect this in real time ?)
- * @return uptime for the system
- * @bug Are we overflow protected here ? (seem to recall some issues with overflow before ?)
- */
+* Get uptime from counter
+* @bug Do we need to collect this all the time ? (perhaps we can collect this in real time ?)
+* @return uptime for the system
+* @bug Are we overflow protected here ? (seem to recall some issues with overflow before ?)
+*/
 long long PDHCollector::getUptime() {
   MutexLock mutex(mutexHandler);
@@ -147 +147 @@
 }
 /**
- * Memory commit limit (your guess is as good as mine to what this is :)
- * @return Some form of memory check
- */
+* Memory commit limit (your guess is as good as mine to what this is :)
+* @return Some form of memory check
+*/
 long long PDHCollector::getMemCommitLimit() {
   MutexLock mutex(mutexHandler);
@@ -159 +159 @@
 }
 /**
- *
- * Memory committed bytes (your guess is as good as mine to what this is :)
- * @return Some form of memory check
- */
+*
+* Memory committed bytes (your guess is as good as mine to what this is :)
+* @return Some form of memory check
+*/
 long long PDHCollector::getMemCommit() {
   MutexLock mutex(mutexHandler);

modules/CheckSystem/PDHCollector.h

@@ -30 +30 @@
   int checkIntervall_;
 
-  PDHCollectors::StaticPDHCounterListener memCmtLim;
-  PDHCollectors::StaticPDHCounterListener memCmt;
-  PDHCollectors::StaticPDHCounterListener upTime;
+  PDHCollectors::StaticPDHCounterListenerInt memCmtLim;
+  PDHCollectors::StaticPDHCounterListenerInt memCmt;
+  PDHCollectors::StaticPDHCounterListenerInt upTime;
   PDHCollectors::RoundINTPDHBufferListener cpu;
 

modules/FileLogger/FileLogger.cpp

@@ -4 +4 @@
 #include "stdafx.h"
 #include "FileLogger.h"
+
+#include <sys/timeb.h>
+#include <time.h>
 
 FileLogger gFileLogger;
@@ -18 +21 @@
 }
 
+std::string FileLogger::getFileName()
+{
+  if (file_.empty()) {
+    file_ = NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_FILENAME, LOG_FILENAME_DEFAULT);
+    if (file_.find("\\") == std::string::npos)
+      file_ = NSCModuleHelper::getBasePath() + "\\" + file_;
+  }
+  return file_;
+}
+
 bool FileLogger::loadModule() {
-  file_ = NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_FILENAME, LOG_FILENAME_DEFAULT);
+  _tzset();
+  getFileName();
+  format_ = NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_DATEMASK, LOG_DATEMASK_DEFAULT);
   return true;
 }
@@ -26 +41 @@
 }
 std::string FileLogger::getModuleName() {
-  return "File logger: " + NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_FILENAME, LOG_FILENAME_DEFAULT);
+  return "File logger: " + getFileName();
 }
 NSCModuleWrapper::module_version FileLogger::getModuleVersion() {
@@ -39 +54 @@
 }
 void FileLogger::handleMessage(int msgType, char* file, int line, char* message) {
+  char buffer[64];
   std::ofstream stream(file_.c_str(), std::ios::app);
-  stream << NSCHelper::translateMessageType(msgType) << ":" << file << ":" << line << ": " << message << std::endl;
+  __time64_t ltime;
+  _time64( &ltime );
+  struct tm *today = _localtime64( &ltime );
+  if (today) {
+    int len = strftime(buffer, 63, format_.c_str(), today);
+    if ((len < 1)||(len > 64))
+      strncpy(buffer, "???", 63);
+    else
+      buffer[len] = 0;
+  } else {
+    strncpy(buffer, "???", 63);
+  }
+  stream << buffer << ": " << NSCHelper::translateMessageType(msgType) << ":" << file << ":" << line << ": " << message << std::endl;
 }
 

modules/FileLogger/FileLogger.h

@@ -6 +6 @@
 private:
   std::string file_;
+  std::string format_;
 
 public:
@@ -19 +20 @@
   void handleMessage(int msgType, char* file, int line, char* message);
   int handleCommand(char* command, char **argument, char *returnBuffer, int returnBufferLen);
+
+
+  std::string getFileName();
 };

modules/NRPEListener/NRPEListener.cpp

@@ -22 +22 @@
 }
 
-
+std::string getAllowedHosts() {
+  std::string ret = NSCModuleHelper::getSettingsString(NRPE_SECTION_TITLE, MAIN_ALLOWED_HOSTS, "");
+  if (ret.empty())
+    ret = NSCModuleHelper::getSettingsString(MAIN_SECTION_TITLE, MAIN_ALLOWED_HOSTS, MAIN_ALLOWED_HOSTS_DEFAULT);
+  return ret;
+}
 
 bool NRPEListener::loadModule() {
@@ -43 +48 @@
   }
 
-  allowedHosts.setAllowedHosts(strEx::splitEx(NSCModuleHelper::getSettingsString(NRPE_SECTION_TITLE, NRPE_SETTINGS_ALLOWED, NRPE_SETTINGS_ALLOWED_DEFAULT), ","));
+  allowedHosts.setAllowedHosts(strEx::splitEx(getAllowedHosts(), ","));
   try {
     if (bUseSSL_) {
@@ -201 +206 @@
       }
       delete [] buf;
-      result = NSCHelper::int2nagios(GetExitCodeProcess(pi.hProcess, &dwexitcode));
+      GetExitCodeProcess(pi.hProcess, &dwexitcode);
+      result = NSCHelper::int2nagios(dwexitcode);
     }
     CloseHandle(pi.hThread);

modules/NSClientListener/NSClientListener.cpp

@@ -32 +32 @@
 NSClientListener::~NSClientListener() {
 }
+std::string getAllowedHosts() {
+  std::string ret = NSCModuleHelper::getSettingsString(NRPE_SECTION_TITLE, MAIN_ALLOWED_HOSTS, "");
+  if (ret.empty())
+    ret = NSCModuleHelper::getSettingsString(MAIN_SECTION_TITLE, MAIN_ALLOWED_HOSTS, MAIN_ALLOWED_HOSTS_DEFAULT);
+  return ret;
+}
 
 bool NSClientListener::loadModule() {
-  allowedHosts.setAllowedHosts(strEx::splitEx(NSCModuleHelper::getSettingsString(NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_ALLOWED, NSCLIENT_SETTINGS_ALLOWED_DEFAULT), ","));
+  allowedHosts.setAllowedHosts(strEx::splitEx(getAllowedHosts(), ","));
   try {
     socket.setHandler(this);
@@ -85 +91 @@
 */
 
+
+std::string getPassword() {
+  static std::string password = "";
+  if (password.empty()) {
+    password = NSCModuleHelper::getSettingsString(NSCLIENT_SECTION_TITLE, MAIN_OBFUSCATED_PASWD, MAIN_OBFUSCATED_PASWD_DEFAULT);
+    if (password.empty())
+      password= NSCModuleHelper::getSettingsString(MAIN_SECTION_TITLE, MAIN_OBFUSCATED_PASWD, MAIN_OBFUSCATED_PASWD_DEFAULT);
+    if (!password.empty()) {
+      password = NSCModuleHelper::Decrypt(password);
+    } else {
+      password = NSCModuleHelper::getSettingsString(NSCLIENT_SECTION_TITLE, MAIN_SETTINGS_PWD, MAIN_SETTINGS_PWD_DEFAULT);
+      if (password.empty())
+        password = NSCModuleHelper::getSettingsString(MAIN_SECTION_TITLE, MAIN_SETTINGS_PWD, MAIN_SETTINGS_PWD_DEFAULT);
+    }
+  }
+  return password;
+}
+
 std::string NSClientListener::parseRequest(std::string buffer)  {
   strEx::token pwd = strEx::getToken(buffer, '&');
-  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())
+  std::string rPwd = getPassword();
+  if ((pwd.first != rPwd) && ((pwd.first == "None") && (!rPwd.empty())) ) {
+    NSC_LOG_ERROR_STD("Invalid password (" + pwd.first + ").");
+    return "ERROR: Invalid password."; 
+  } if (pwd.second.empty())
     return "ERRRO: No command specified.";
   strEx::token cmd = strEx::getToken(pwd.second, '&');
@@ -113 +139 @@
     case REQ_CLIENTVERSION:
       {
-        std::string v = NSCModuleHelper::getSettingsString("nsclient compat", "version", "modern");
-        if (v == "modern")
+        std::string v = NSCModuleHelper::getSettingsString(NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_VERSION, NSCLIENT_SETTINGS_VERSION_DEFAULT);
+        if (v == "auto")
           return NSCModuleHelper::getApplicationName() + " " + NSCModuleHelper::getApplicationVersionString();
-        return NSCModuleHelper::getSettingsString("nsclient compat", "version", "modern");
+        return v;
       }
     case REQ_SERVICESTATE:
       cmd.first = "checkServiceState";
+      cmd.second += "&nsclient";
       break;
     case REQ_PROCSTATE:
       cmd.first = "checkProcState";
+      cmd.second += "&nsclient";
       break;
     case REQ_MEMUSE: