Changeset 207

Timestamp:

11/08/09 23:24:31 (2 years ago)

Author:

mickem

Message:

First attempt at serious boostification.
NOTICE! This is NOT a complete edition, it build and runs but many features are disabled and/or broken.
But we have working, sockets and mutexes and conversion functions from boost inside now and more to come...
Also started to build with CMake since it works better then boost.build

Location:

trunk

Files:

• . (modified) (1 prop)
• NSClient++-2005.sln (modified) (10 diffs)
• include/NSCAPI.h (modified) (4 diffs)
• include/NSCHelper.cpp (modified) (3 diffs)
• include/NSCHelper.h (modified) (7 diffs)
• include/NTService.h (modified) (1 diff)
• include/arrayBuffer.cpp (modified) (10 diffs)
• include/arrayBuffer.h (modified) (4 diffs)
• include/charEx.h (modified) (6 diffs)
• include/checkHelpers.hpp (modified) (2 diffs)
• include/config.h (modified) (2 diffs)
• include/dll (added)
• include/dll/dll.hpp (added)
• include/dll/impl_unix.hpp (added)
• include/dll/impl_w32.hpp (added)
• include/error.hpp (modified) (1 diff)
• include/error_impl_unix.hpp (added)
• include/error_impl_w32.hpp (added)
• include/nrpe/nrpepacket.hpp (modified) (1 diff)
• include/nsc_module_wrapper.hpp (added)
• include/service (added)
• include/service/system_service.hpp (added)
• include/service/unix_service.hpp (added)
• include/settings/macros.h (modified) (4 diffs)
• include/settings/settings_old.hpp (modified) (1 diff)
• include/settings/settings_registry.hpp (modified) (1 diff)
• include/strEx.h (modified) (24 diffs)
• include/unicode_char.hpp (added)
• modules/CheckDisk/CheckDisk.cpp (modified) (1 diff)
• modules/CheckDisk/stdafx.h (modified) (1 diff)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (2 diffs)
• modules/CheckEventLog/stdafx.h (modified) (1 diff)
• modules/CheckExternalScripts (modified) (1 prop)
• modules/CheckExternalScripts/CheckExternalScripts-2005.vcproj (modified) (3 diffs)
• modules/CheckExternalScripts/stdafx.h (modified) (1 diff)
• modules/CheckHelpers/stdafx.h (modified) (1 diff)
• modules/CheckSystem/CheckSystem.cpp (modified) (1 diff)
• modules/CheckSystem/stdafx.h (modified) (1 diff)
• modules/CheckTaskSched/stdafx.h (modified) (1 diff)
• modules/CheckWMI/WMIQuery.h (modified) (1 diff)
• modules/CheckWMI/stdafx.h (modified) (1 diff)
• modules/DebugLogMetrics/stdafx.h (modified) (1 diff)
• modules/FileLogger/stdafx.h (modified) (1 diff)
• modules/LUAScript/stdafx.h (modified) (1 diff)
• modules/NRPEClient/NRPEClient.cpp (modified) (7 diffs)
• modules/NRPEClient/stdafx.h (modified) (1 diff)
• modules/NRPEListener/stdafx.h (modified) (1 diff)
• modules/NSCAAgent/stdafx.h (modified) (1 diff)
• modules/NSClientListener/stdafx.h (modified) (1 diff)
• modules/SysTray/stdafx.h (modified) (1 diff)
• nrpe_dh_512.pem (added)
• service/CMakeLists.txt (added)
• service/NSCPlugin.cpp (modified) (19 diffs)
• service/NSCPlugin.h (modified) (5 diffs)
• service/NSClient++-2005.vcproj (modified) (7 diffs)
• service/NSClient++.cpp (modified) (15 diffs)
• service/NSClient++.h (modified) (4 diffs)
• service/StdAfx.h (modified) (3 diffs)
• service/config.h.in (added)
• service/core_api.cpp (modified) (5 diffs)

trunk

@@ -11 +11 @@
 build.log
 AutoBuild.h.bak
+stage_cmake

@@ -11 +11 @@
 build.log
 AutoBuild.h.bak
+stage_cmake

trunk/NSClient++-2005.sln

@@ -237 +237 @@
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.Debug|Mixed Platforms.Build.0 = Debug|x64
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.Debug|Win32.ActiveCfg = Debug|Win32
-    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Debug|Win32.Build.0 = Debug|Win32
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.Debug|x64.ActiveCfg = Debug|x64
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.Debug|x64.Build.0 = Debug|x64
@@ -321 +320 @@
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug|Mixed Platforms.Build.0 = Debug|x64
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug|Win32.ActiveCfg = Debug|Win32
-    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug|Win32.Build.0 = Debug|Win32
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug|x64.ActiveCfg = Debug|x64
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug|x64.Build.0 = Debug|x64
@@ -342 +340 @@
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug|Mixed Platforms.Build.0 = Debug|x64
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug|Win32.ActiveCfg = Debug|Win32
-    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug|Win32.Build.0 = Debug|Win32
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug|x64.ActiveCfg = Debug|x64
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug|x64.Build.0 = Debug|x64
@@ -426 +423 @@
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug|Mixed Platforms.Build.0 = Debug|x64
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug|Win32.ActiveCfg = Debug|Win32
-    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug|Win32.Build.0 = Debug|Win32
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug|x64.ActiveCfg = Debug|x64
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug|x64.Build.0 = Debug|x64
@@ -503 +499 @@
     {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|Mixed Platforms.Build.0 = Debug|x64
     {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|Win32.ActiveCfg = Debug|Win32
-    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|Win32.Build.0 = Debug|Win32
     {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|x64.ActiveCfg = Debug|x64
     {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}.Debug|x64.Build.0 = Debug|x64
@@ -545 +540 @@
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Debug|Mixed Platforms.Build.0 = Debug|x64
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Debug|Win32.ActiveCfg = Debug|Win32
-    {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Debug|Win32.Build.0 = Debug|Win32
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Debug|x64.ActiveCfg = Debug|x64
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Debug|x64.Build.0 = Debug|x64
@@ -566 +560 @@
     {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug|Mixed Platforms.Build.0 = Debug|Win32
     {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug|Win32.ActiveCfg = Debug|Win32
-    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug|Win32.Build.0 = Debug|Win32
     {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug|x64.ActiveCfg = Debug|x64
     {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug|x64.Build.0 = Debug|x64
@@ -675 +668 @@
     {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|Mixed Platforms.Build.0 = Debug
     {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|Win32.ActiveCfg = Debug
-    {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|Win32.Build.0 = Debug
     {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|x64.ActiveCfg = Debug
     {B6A2BD0C-9633-4DD4-A350-D98ACE660937}.Debug|x64.Build.0 = Debug
@@ -696 +688 @@
     {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Mixed Platforms.ActiveCfg = Release|x64
     {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Mixed Platforms.Build.0 = Release|x64
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Win32.ActiveCfg = Release|Win32
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Win32.Build.0 = Release|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Win32.ActiveCfg = Debug|Win32
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Win32.Build.0 = Debug|Win32
     {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|x64.ActiveCfg = Release|x64
     {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|x64.Build.0 = Release|x64
@@ -761 +753 @@
     {743B2362-DF6A-4C28-A6C9-0F970D8E1B66} = {9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}
     {DF1DB6FB-0448-46D6-AE82-9901495E5F1A} = {9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {CADF69A1-D324-4FA4-A33D-2CDE22C3BB96}
+    {43718644-173B-42D8-8AD1-E359BFB2BB20} = {CADF69A1-D324-4FA4-A33D-2CDE22C3BB96}
     {D367E76D-9485-4DCB-A9D0-3D3C0E190648} = {BBE9A5E7-A16B-443C-A349-823DED5A9FF3}
     {1D9DEE38-BBDC-49DE-A6F3-BAC26E114C1D} = {BBE9A5E7-A16B-443C-A349-823DED5A9FF3}
     {B6A2BD0C-9633-4DD4-A350-D98ACE660937} = {FC917E21-188A-44EE-9EF2-7C1274C2D719}
-    {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {CADF69A1-D324-4FA4-A33D-2CDE22C3BB96}
-    {43718644-173B-42D8-8AD1-E359BFB2BB20} = {CADF69A1-D324-4FA4-A33D-2CDE22C3BB96}
   EndGlobalSection
   GlobalSection(DPCodeReviewSolutionGUID) = preSolution

trunk/include/NSCAPI.h

@@ -22 +22 @@
 
 
-#include <tchar.h>
+#include <unicode_char.hpp>
 
 namespace NSCAPI {
@@ -79 +79 @@
 #endif
 
-  const int xor = 1;
+  const int encryption_xor = 1;
 
   // Settings types
@@ -96 +96 @@
 
   struct plugin_info {
-    TCHAR *dll;
-    TCHAR *name;
-    TCHAR *description;
-    TCHAR *version;
+    wchar_t *dll;
+    wchar_t *name;
+    wchar_t *description;
+    wchar_t *version;
   };
   typedef plugin_info* plugin_info_list;
@@ -105 +105 @@
 
 };
+
+namespace NSCModuleHelper {
+  typedef void* (*lpNSAPILoader)(wchar_t*);
+}

trunk/include/NSCHelper.cpp

@@ -21 +21 @@
 
 #include <NSCHelper.h>
+#include <nsc_module_wrapper.hpp>
 #include <msvc_wrappers.h>
-#include <config.h>
+#include <settings/macros.h>
+#include <arrayBuffer.h>
+//#include <config.h>
 #include <strEx.h>
 
@@ -67 +70 @@
 * @return NSCAPI::success unless the buffer is to short then it will be NSCAPI::invalidBufferLen
 */
-int NSCHelper::wrapReturnString(TCHAR *buffer, unsigned int bufLen, std::wstring str, int defaultReturnCode ) {
+int NSCHelper::wrapReturnString(wchar_t *buffer, unsigned int bufLen, std::wstring str, int defaultReturnCode ) {
   // @todo deprecate this
   if (str.length() >= bufLen) {
@@ -215 +218 @@
  * @return The returned status of the command
  */
-NSCAPI::nagiosReturn NSCModuleHelper::InjectCommandRAW(const TCHAR* command, const unsigned int argLen, TCHAR **argument, TCHAR *returnMessageBuffer, unsigned int returnMessageBufferLen, TCHAR *returnPerfBuffer, unsigned int returnPerfBufferLen) 
+NSCAPI::nagiosReturn NSCModuleHelper::InjectCommandRAW(const wchar_t* command, const unsigned int argLen, TCHAR **argument, TCHAR *returnMessageBuffer, unsigned int returnMessageBufferLen, TCHAR *returnPerfBuffer, unsigned int returnPerfBufferLen) 
 {
   if (!fNSAPIInject)

trunk/include/NSCHelper.h

@@ -27 +27 @@
 #include <charEx.h>
 #include <arrayBuffer.h>
-#include <windows.h>
+#ifdef WIN32
+//#include <windows.h>
+#endif
 
 
@@ -33 +35 @@
 {
 #ifdef DEBUG
-  NSCAPI::nagiosReturn wrapReturnString(TCHAR *buffer, unsigned int bufLen, std::wstring str, NSCAPI::nagiosReturn defaultReturnCode);
-  NSCAPI::errorReturn wrapReturnString(TCHAR *buffer, unsigned int bufLen, std::wstring str, NSCAPI::errorReturn defaultReturnCode);
+  NSCAPI::nagiosReturn wrapReturnString(wchar_t *buffer, unsigned int bufLen, std::wstring str, NSCAPI::nagiosReturn defaultReturnCode);
+  NSCAPI::errorReturn wrapReturnString(wchar_t *buffer, unsigned int bufLen, std::wstring str, NSCAPI::errorReturn defaultReturnCode);
 #else
-  int wrapReturnString(TCHAR *buffer, unsigned int bufLen, std::wstring str, int defaultReturnCode);
+  int wrapReturnString(wchar_t *buffer, unsigned int bufLen, std::wstring str, int defaultReturnCode);
 #endif
   std::wstring translateMessageType(NSCAPI::messageTypes msgType);
@@ -108 +110 @@
   typedef std::list<plugin_info_type> plugin_info_list;
   // Types for the Callbacks into the main program
-  typedef NSCAPI::errorReturn (*lpNSAPIGetBasePath)(TCHAR*,unsigned int);
-  typedef NSCAPI::errorReturn (*lpNSAPIGetApplicationName)(TCHAR*,unsigned int);
-  typedef NSCAPI::errorReturn (*lpNSAPIGetApplicationVersionStr)(TCHAR*,unsigned int);
-  typedef NSCAPI::errorReturn (*lpNSAPIGetSettingsString)(const TCHAR*,const TCHAR*,const TCHAR*,TCHAR*,unsigned int);
-  typedef NSCAPI::errorReturn (*lpNSAPIGetSettingsInt)(const TCHAR*, const TCHAR*, int);
-  typedef NSCAPI::errorReturn (*lpNSAPIGetSettingsSection)(const TCHAR*, arrayBuffer::arrayBuffer*, unsigned int *);
+  
+  typedef NSCAPI::errorReturn (*lpNSAPIGetBasePath)(wchar_t*,unsigned int);
+  typedef NSCAPI::errorReturn (*lpNSAPIGetApplicationName)(wchar_t*,unsigned int);
+  typedef NSCAPI::errorReturn (*lpNSAPIGetApplicationVersionStr)(wchar_t*,unsigned int);
+  typedef NSCAPI::errorReturn (*lpNSAPIGetSettingsString)(const wchar_t*,const wchar_t*,const wchar_t*,wchar_t*,unsigned int);
+  typedef NSCAPI::errorReturn (*lpNSAPIGetSettingsInt)(const wchar_t*, const wchar_t*, int);
+  typedef NSCAPI::errorReturn (*lpNSAPIGetSettingsSection)(const wchar_t*, arrayBuffer::arrayBuffer*, unsigned int *);
   typedef NSCAPI::errorReturn (*lpNSAPIReleaseSettingsSectionBuffer)(arrayBuffer::arrayBuffer*, unsigned int *);
-  typedef void (*lpNSAPIMessage)(int, const TCHAR*, const int, const TCHAR*);
+  typedef void (*lpNSAPIMessage)(int, const wchar_t*, const int, const wchar_t*);
   typedef NSCAPI::errorReturn (*lpNSAPIStopServer)(void);
   typedef NSCAPI::errorReturn (*lpNSAPIExit)(void);
-  typedef NSCAPI::nagiosReturn (*lpNSAPIInject)(const TCHAR*, const unsigned int, TCHAR **, TCHAR *, unsigned int, TCHAR *, unsigned int);
-  typedef void* (*lpNSAPILoader)(TCHAR*);
+  typedef NSCAPI::nagiosReturn (*lpNSAPIInject)(const wchar_t*, const unsigned int, wchar_t **, wchar_t *, unsigned int, wchar_t *, unsigned int);
+  
   typedef NSCAPI::boolReturn (*lpNSAPICheckLogMessages)(int);
-  typedef NSCAPI::errorReturn (*lpNSAPIEncrypt)(unsigned int, const TCHAR*, unsigned int, TCHAR*, unsigned int *);
-  typedef NSCAPI::errorReturn (*lpNSAPIDecrypt)(unsigned int, const TCHAR*, unsigned int, TCHAR*, unsigned int *);
-  typedef NSCAPI::errorReturn (*lpNSAPISetSettingsString)(const TCHAR*, const TCHAR*, const TCHAR*);
-  typedef NSCAPI::errorReturn (*lpNSAPISetSettingsInt)(const TCHAR*, const TCHAR*, int);
+  typedef NSCAPI::errorReturn (*lpNSAPIEncrypt)(unsigned int, const wchar_t*, unsigned int, wchar_t*, unsigned int *);
+  typedef NSCAPI::errorReturn (*lpNSAPIDecrypt)(unsigned int, const wchar_t*, unsigned int, wchar_t*, unsigned int *);
+  typedef NSCAPI::errorReturn (*lpNSAPISetSettingsString)(const wchar_t*, const wchar_t*, const wchar_t*);
+  typedef NSCAPI::errorReturn (*lpNSAPISetSettingsInt)(const wchar_t*, const wchar_t*, int);
   typedef NSCAPI::errorReturn (*lpNSAPIWriteSettings)(int);
   typedef NSCAPI::errorReturn (*lpNSAPIReadSettings)(int);
   typedef NSCAPI::errorReturn (*lpNSAPIRehash)(int);
-  typedef NSCAPI::errorReturn (*lpNSAPIDescribeCommand)(const TCHAR*,TCHAR*,unsigned int);
+  typedef NSCAPI::errorReturn (*lpNSAPIDescribeCommand)(const wchar_t*,wchar_t*,unsigned int);
   typedef NSCAPI::errorReturn (*lpNSAPIGetAllCommandNames)(arrayBuffer::arrayBuffer*, unsigned int *);
   typedef NSCAPI::errorReturn (*lpNSAPIReleaseAllCommandNamessBuffer)(arrayBuffer::arrayBuffer*, unsigned int *);
-  typedef NSCAPI::errorReturn (*lpNSAPIRegisterCommand)(const TCHAR*,const TCHAR*);
-  typedef NSCAPI::errorReturn (*lpNSAPISettingsRegKey)(const TCHAR*, const TCHAR*, int, const TCHAR*, const TCHAR*, const TCHAR*, int);
-  typedef NSCAPI::errorReturn (*lpNSAPISettingsRegPath)(const TCHAR*, const TCHAR*, const TCHAR*, int);
+  typedef NSCAPI::errorReturn (*lpNSAPIRegisterCommand)(const wchar_t*,const wchar_t*);
+  typedef NSCAPI::errorReturn (*lpNSAPISettingsRegKey)(const wchar_t*, const wchar_t*, int, const wchar_t*, const wchar_t*, const wchar_t*, int);
+  typedef NSCAPI::errorReturn (*lpNSAPISettingsRegPath)(const wchar_t*, const wchar_t*, const wchar_t*, int);
   typedef NSCAPI::errorReturn (*lpNSAPIGetPluginList)(int *len, NSCAPI::plugin_info *list[]);
   typedef NSCAPI::errorReturn (*lpNSAPIReleasePluginList)(int len, NSCAPI::plugin_info *list[]);
@@ -150 +153 @@
 
   void Message(int msgType, std::wstring file, int line, std::wstring message);
-  NSCAPI::nagiosReturn InjectCommandRAW(const TCHAR* command, const unsigned int argLen, TCHAR **argument, TCHAR *returnMessageBuffer, unsigned int returnMessageBufferLen, TCHAR *returnPerfBuffer, unsigned int returnPerfBufferLen);
-  NSCAPI::nagiosReturn InjectCommand(const TCHAR* command, const unsigned int argLen, TCHAR **argument, std::wstring & message, std::wstring & perf);
-  NSCAPI::nagiosReturn InjectCommand(const TCHAR* command, std::list<std::wstring> argument, std::wstring & message, std::wstring & perf);
-  NSCAPI::nagiosReturn InjectSplitAndCommand(const TCHAR* command, TCHAR* buffer, TCHAR splitChar, std::wstring & message, std::wstring & perf);
-  NSCAPI::nagiosReturn InjectSplitAndCommand(const std::wstring command, const std::wstring buffer, TCHAR splitChar, std::wstring & message, std::wstring & perf, bool escape = false);
+  NSCAPI::nagiosReturn InjectCommandRAW(const wchar_t* command, const unsigned int argLen, wchar_t **argument, wchar_t *returnMessageBuffer, unsigned int returnMessageBufferLen, wchar_t *returnPerfBuffer, unsigned int returnPerfBufferLen);
+  NSCAPI::nagiosReturn InjectCommand(const wchar_t* command, const unsigned int argLen, wchar_t **argument, std::wstring & message, std::wstring & perf);
+  NSCAPI::nagiosReturn InjectCommand(const wchar_t* command, std::list<std::wstring> argument, std::wstring & message, std::wstring & perf);
+  NSCAPI::nagiosReturn InjectSplitAndCommand(const wchar_t* command, wchar_t* buffer, wchar_t splitChar, std::wstring & message, std::wstring & perf);
+  NSCAPI::nagiosReturn InjectSplitAndCommand(const std::wstring command, const std::wstring buffer, wchar_t splitChar, std::wstring & message, std::wstring & perf, bool escape = false);
   void StopService(void);
   void Exit(void);
@@ -160 +163 @@
   bool logDebug();
   bool checkLogMessages(int type);
-  std::wstring Encrypt(std::wstring str, unsigned int algorithm = NSCAPI::xor);
-  std::wstring Decrypt(std::wstring str, unsigned int algorithm = NSCAPI::xor);
+  std::wstring Encrypt(std::wstring str, unsigned int algorithm = NSCAPI::encryption_xor);
+  std::wstring Decrypt(std::wstring str, unsigned int algorithm = NSCAPI::encryption_xor);
   NSCAPI::errorReturn SetSettingsString(std::wstring section, std::wstring key, std::wstring value);
   NSCAPI::errorReturn SetSettingsInt(std::wstring section, std::wstring key, int value);
@@ -175 +178 @@
 };
 
-namespace NSCModuleWrapper {
-  struct module_version {
-    int major;
-    int minor;
-    int revision;
-  };
-
-  BOOL wrapDllMain(HANDLE hModule, DWORD ul_reason_for_call);
-  HINSTANCE getModule();
-
-  int wrapModuleHelperInit(NSCModuleHelper::lpNSAPILoader f);;
-  NSCAPI::errorReturn wrapGetModuleName(TCHAR* buf, unsigned int buflen, std::wstring str);
-  NSCAPI::errorReturn wrapGetConfigurationMeta(TCHAR* buf, unsigned int buflen, std::wstring str);
-  int wrapLoadModule(bool success);
-  NSCAPI::errorReturn wrapGetModuleVersion(int *major, int *minor, int *revision, module_version version);
-  NSCAPI::boolReturn wrapHasCommandHandler(bool has);
-  NSCAPI::boolReturn wrapHasMessageHandler(bool has);
-  int wrapUnloadModule(bool success);
-  NSCAPI::nagiosReturn wrapHandleCommand(NSCAPI::nagiosReturn retResult, const std::wstring retMessage, const std::wstring retPerformance, TCHAR *returnBufferMessage, unsigned int returnBufferMessageLen, TCHAR *returnBufferPerf, unsigned int returnBufferPerfLen);
-}
-
-//////////////////////////////////////////////////////////////////////////
-// Module wrappers (definitions)
-#define NSC_WRAPPERS_MAIN() \
-  extern "C" int NSModuleHelperInit(NSCModuleHelper::lpNSAPILoader f); \
-  extern int NSLoadModule(int mode); \
-  extern int NSGetModuleName(TCHAR* buf, int buflen); \
-  extern int NSGetModuleDescription(TCHAR* buf, int buflen); \
-  extern int NSGetModuleVersion(int *major, int *minor, int *revision); \
-  extern NSCAPI::boolReturn NSHasCommandHandler(); \
-  extern NSCAPI::boolReturn NSHasMessageHandler(); \
-  extern void NSHandleMessage(int msgType, TCHAR* file, int line, TCHAR* message); \
-  extern NSCAPI::nagiosReturn NSHandleCommand(const TCHAR* IN_cmd, const unsigned int IN_argsLen, TCHAR **IN_args, \
-    TCHAR *OUT_retBufMessage, unsigned int IN_retBufMessageLen, TCHAR *OUT_retBufPerf, unsigned int IN_retBufPerfLen); \
-  extern int NSUnloadModule(); \
-  extern int NSGetConfigurationMeta(int IN_retBufLen, TCHAR *OUT_retBuf)
-
-#define NSC_WRAPPERS_CLI() \
-  extern int NSCommandLineExec(const TCHAR*,const unsigned int,TCHAR**)
-
-#ifdef DEBUG
-#define NSC_LOG_ERROR_STD_C(msg) NSC_LOG_ERROR(((std::wstring)msg).c_str())
-#define NSC_LOG_ERROR_C(msg) { \
-  NSCModuleHelper::Message(NSCAPI::error, _T(__FILE__), __LINE__, msg) \
-  std::wcerr << msg << std::endl; }
-#else
-#define NSC_LOG_ERROR_STD_C(msg) NSC_LOG_ERROR_STD(msg)
-#define NSC_LOG_ERROR_C(msg) NSC_LOG_ERROR(msg)
-#endif
-
-
-#define NSC_LOG_ERROR_STD(msg) NSC_LOG_ERROR(((std::wstring)msg).c_str())
-#define NSC_LOG_ERROR(msg) \
-  NSCModuleHelper::Message(NSCAPI::error, _T(__FILE__), __LINE__, msg)
-
-#define NSC_LOG_CRITICAL_STD(msg) NSC_LOG_CRITICAL(((std::wstring)msg).c_str())
-#define NSC_LOG_CRITICAL(msg) \
-  NSCModuleHelper::Message(NSCAPI::critical, _T(__FILE__), __LINE__, msg)
-
-#define NSC_LOG_MESSAGE_STD(msg) NSC_LOG_MESSAGE(((std::wstring)msg).c_str())
-#define NSC_LOG_MESSAGE(msg) \
-  NSCModuleHelper::Message(NSCAPI::log, _T(__FILE__), __LINE__, msg)
-
-//#define NSC_DEBUG_MSG_STD(msg) NSC_DEBUG_MSG(((std::wstring)msg).c_str())
-#define NSC_DEBUG_MSG_STD(msg) NSC_DEBUG_MSG((std::wstring)msg)
-#define NSC_DEBUG_MSG(msg) \
-  NSCModuleHelper::Message(NSCAPI::debug, _T(__FILE__), __LINE__, msg)
-
-/*
-#define NSC_DEBUG_MSG_STD(msg)
-#define NSC_DEBUG_MSG(msg)
-*/
-//////////////////////////////////////////////////////////////////////////
-// Message wrappers below this point
-
-#define NSC_WRAPPERS_MAIN_DEF(toObject) \
-  extern int NSModuleHelperInit(NSCModuleHelper::lpNSAPILoader f) { \
-    try { \
-      return NSCModuleWrapper::wrapModuleHelperInit(f); \
-    } catch (...) { \
-      NSC_LOG_CRITICAL(_T("Unknown exception in: wrapModuleHelperInit(...)")); \
-      return NSCAPI::hasFailed; \
-    } \
-  } \
-  extern int NSLoadModule(int mode) { \
-    try { \
-      return NSCModuleWrapper::wrapLoadModule(toObject.loadModule(mode)); \
-    } catch (NSCModuleHelper::NSCMHExcpetion e) { \
-      NSC_LOG_CRITICAL(_T("NSCMHE in: wrapLoadModule: " + e.msg_)); \
-      return NSCAPI::hasFailed; \
-    } catch (...) { \
-      NSC_LOG_CRITICAL(_T("Unknown exception in: wrapLoadModule(...)")); \
-      return NSCAPI::hasFailed; \
-    } \
-  } \
-  extern int NSGetModuleName(TCHAR* buf, int buflen) { \
-    try { \
-      return NSCModuleWrapper::wrapGetModuleName(buf, buflen, toObject.getModuleName()); \
-    } catch (...) { \
-      NSC_LOG_CRITICAL(_T("Unknown exception in: wrapGetModuleName(...)")); \
-      return NSCAPI::hasFailed; \
-    } \
-  } \
-  extern int NSGetModuleDescription(TCHAR* buf, int buflen) { \
-    try { \
-      return NSCModuleWrapper::wrapGetModuleName(buf, buflen, toObject.getModuleDescription()); \
-    } catch (...) { \
-      NSC_LOG_CRITICAL(_T("Unknown exception in: wrapGetModuleName(...)")); \
-      return NSCAPI::hasFailed; \
-    } \
-  } \
-  extern int NSGetModuleVersion(int *major, int *minor, int *revision) { \
-    try { \
-      return NSCModuleWrapper::wrapGetModuleVersion(major, minor, revision, toObject.getModuleVersion()); \
-    } catch (...) { \
-      NSC_LOG_CRITICAL(_T("Unknown exception in: wrapGetModuleVersion(...)")); \
-      return NSCAPI::hasFailed; \
-    } \
-  } \
-  extern int NSUnloadModule() { \
-    try { \
-      return NSCModuleWrapper::wrapUnloadModule(toObject.unloadModule()); \
-    } catch (...) { \
-      NSC_LOG_CRITICAL(_T("Unknown exception in: wrapGetModuleVersion(...)")); \
-      return NSCAPI::hasFailed; \
-    } \
-  }
-#define NSC_WRAPPERS_HANDLE_MSG_DEF(toObject) \
-  extern void NSHandleMessage(int msgType, TCHAR* file, int line, TCHAR* message) { \
-    try { \
-      toObject.handleMessage(msgType, file, line, message); \
-    } catch (...) { \
-      NSC_LOG_CRITICAL(_T("Unknown exception in: handleMessage(...)")); \
-    } \
-  } \
-  extern NSCAPI::boolReturn NSHasMessageHandler() { \
-    try { \
-      return NSCModuleWrapper::wrapHasMessageHandler(toObject.hasMessageHandler()); \
-    } catch (...) { \
-      NSC_LOG_CRITICAL(_T("Unknown exception in: wrapHasMessageHandler(...)")); \
-      return NSCAPI::isfalse; \
-    } \
-  }
-#define NSC_WRAPPERS_IGNORE_MSG_DEF() \
-  extern void NSHandleMessage(int msgType, TCHAR* file, int line, TCHAR* message) {} \
-  extern NSCAPI::boolReturn NSHasMessageHandler() { return NSCAPI::isfalse; }
-#define NSC_WRAPPERS_HANDLE_CMD_DEF(toObject) \
-  extern NSCAPI::nagiosReturn NSHandleCommand(const TCHAR* IN_cmd, const unsigned int IN_argsLen, TCHAR **IN_args, \
-                  TCHAR *OUT_retBufMessage, unsigned int IN_retBufMessageLen, TCHAR *OUT_retBufPerf, unsigned int IN_retBufPerfLen) \
-  { \
-    try { \
-      std::wstring message, perf; \
-      NSCAPI::nagiosReturn retCode = toObject.handleCommand(IN_cmd, IN_argsLen, IN_args, message, perf); \
-      return NSCModuleWrapper::wrapHandleCommand(retCode, message, perf, OUT_retBufMessage, IN_retBufMessageLen, OUT_retBufPerf, IN_retBufPerfLen); \
-    } catch (...) { \
-      NSC_LOG_CRITICAL(_T("Unknown exception in: wrapHandleCommand(...)")); \
-      return NSCAPI::returnIgnored; \
-    } \
-  } \
-  extern NSCAPI::boolReturn NSHasCommandHandler() { \
-    try { \
-      return NSCModuleWrapper::wrapHasCommandHandler(toObject.hasCommandHandler()); \
-    } catch (...) { \
-      NSC_LOG_CRITICAL(_T("Unknown exception in: wrapHasCommandHandler(...)")); \
-      return NSCAPI::isfalse; \
-    } \
-  }
-#define NSC_WRAPPERS_IGNORE_CMD_DEF() \
-  extern NSCAPI::nagiosReturn NSHandleCommand(const TCHAR* IN_cmd, const unsigned int IN_argsLen, TCHAR **IN_args, \
-                  TCHAR *OUT_retBufMessage, unsigned int IN_retBufMessageLen, TCHAR *OUT_retBufPerf, unsigned int IN_retBufPerfLen) { \
-    return NSCAPI::returnIgnored; \
-  } \
-  extern NSCAPI::boolReturn NSHasCommandHandler() { return NSCAPI::isfalse; }
-
-
-#define NSC_WRAPPERS_HANDLE_CONFIGURATION(toObject) \
-  extern int NSGetConfigurationMeta(int IN_retBufLen, TCHAR *OUT_retBuf) \
-  { \
-    try { \
-      return NSCModuleWrapper::wrapGetConfigurationMeta(OUT_retBuf, IN_retBufLen, toObject.getConfigurationMeta()); \
-    } catch (...) { \
-      NSC_LOG_CRITICAL(_T("Unknown exception in: wrapGetConfigurationMeta(...)")); \
-      return NSCAPI::hasFailed; \
-    } \
-  }
-
-#define NSC_WRAPPERS_CLI_DEF(toObject) \
-  extern int NSCommandLineExec(const TCHAR* command,const unsigned int argLen,TCHAR** args) { \
-    try { \
-      return toObject.commandLineExec(command, argLen, args); \
-    } catch (...) { \
-      NSC_LOG_CRITICAL(_T("Unknown exception in: commandLineExec(...)")); \
-      std::wcerr << _T("Unknown exception in: commandLineExec(...)") << std::endl; \
-      return NSCAPI::hasFailed; \
-    } \
-  } \
-
-//////////////////////////////////////////////////////////////////////////
-#define MODULE_SETTINGS_START(class, name, description) \
-  std::wstring class::getConfigurationMeta() { \
-  return (std::wstring)_T("<module name=\"") + name + _T("\" description=\"") + description + _T("\">") \
-  _T("<pages>")
-
-
-#define ADVANCED_PAGE(title) \
-  _T("<page title=\"") title _T("\" advanced=\"true\">") \
-  _T("<items>")
-
-#define PAGE(title) \
-  _T("<page title=\"") title _T("\">") \
-  _T("<items>")
-
-#define ITEM_EDIT_TEXT(caption, description) \
-  _T("<item type=\"text\" caption=\"") caption _T("\" description=\"") description _T("\"><options>")
-
-#define ITEM_EDIT_OPTIONAL_LIST(caption, description) \
-  _T("<item type=\"optional_list\" caption=\"") caption _T("\" description=\"") description _T("\"><options>")
-
-#define ITEM_CHECK_BOOL(caption, description) \
-  _T("<item type=\"bool\" caption=\"") caption _T("\" description=\"") description _T("\"><options>")
-
-#define ITEM_MAP_TO(type) \
-  _T("</options><mapper type=\"") type _T("\">") \
-  _T("<options>")
-
-#define OPTION(key, value) \
-  _T("<option key=\"") key _T("\" value=\"") value _T("\"/>")
-
-#define ITEM_END() \
-  _T("</options>") \
-  _T("</mapper>") \
-  _T("</item>")
-
-#define PAGE_END() \
-  _T("</items>") \
-  _T("</page>")
-
-#define MODULE_SETTINGS_END() \
-      _T("</pages>") \
-    _T("</module>"); \
-  }
 
 #define SETTINGS_MAKE_NAME(key) \
@@ -437 +199 @@
   NSCModuleHelper::settings_register_key(setting_keys::key ## _PATH, setting_keys::key, NSCAPI::key_string, setting_keys::key ## _TITLE, setting_keys::key ## _DESC, setting_keys::key ## _DEFAULT, setting_keys::key ## _ADVANCED);
 #define SETTINGS_REG_KEY_I(key) \
-  NSCModuleHelper::settings_register_key(setting_keys::key ## _PATH, setting_keys::key, NSCAPI::key_integer, setting_keys::key ## _TITLE, setting_keys::key ## _DESC, strEx::itos(setting_keys::key ## _DEFAULT), setting_keys::key ## _ADVANCED);
+  NSCModuleHelper::settings_register_key(setting_keys::key ## _PATH, setting_keys::key, NSCAPI::key_integer, setting_keys::key ## _TITLE, setting_keys::key ## _DESC, boost::lexical_cast<std::wstring>(setting_keys::key ## _DEFAULT), setting_keys::key ## _ADVANCED);
 #define SETTINGS_REG_KEY_B(key) \
   NSCModuleHelper::settings_register_key(setting_keys::key ## _PATH, setting_keys::key, NSCAPI::key_integer, setting_keys::key ## _TITLE, setting_keys::key ## _DESC, setting_keys::key ## _DEFAULT==1?_T("1"):_T("0"), setting_keys::key ## _ADVANCED);

trunk/include/NTService.h

@@ -24 +24 @@
 #include <sysinfo.h>
 
-namespace service_helper {
+namespace service_helper_impl {
   class service_exception {
     std::wstring what_;

trunk/include/arrayBuffer.cpp

@@ -28 +28 @@
  * @return Argument wrapped as a list
  */
-arrayBuffer::arrayList arrayBuffer::arrayBuffer2list(const unsigned int argLen, TCHAR *argument[]) {
+arrayBuffer::arrayList arrayBuffer::arrayBuffer2list(const unsigned int argLen, wchar_t *argument[]) {
   arrayList ret;
   int i=0;
@@ -53 +53 @@
   for (i=0;it!=lst.end();++it,i++) {
     std::wstring::size_type alen = (*it).size();
-    arrayBuffer[i] = new TCHAR[alen+2];
+    arrayBuffer[i] = new wchar_t[alen+2];
     wcsncpy_s(arrayBuffer[i], alen+2, (*it).c_str(), alen+1);
   }
@@ -107 +107 @@
 * @return The arrayBuffer
 */
-arrayBuffer::arrayBuffer arrayBuffer::split2arrayBuffer(const TCHAR* buffer, TCHAR splitChar, unsigned int &argLen) {
+arrayBuffer::arrayBuffer arrayBuffer::split2arrayBuffer(const wchar_t* buffer, wchar_t splitChar, unsigned int &argLen) {
   if (!buffer)
     throw ArrayBufferException(_T("Invalid buffer specified!"));
   argLen = 0;
-  const TCHAR *p = buffer;
+  const wchar_t *p = buffer;
   if (!p[0]) {
     return createEmptyArrayBuffer(argLen);
@@ -121 +121 @@
   }
   argLen++;
-  TCHAR **arrayBuffer = new TCHAR*[argLen];
+  wchar_t **arrayBuffer = new wchar_t*[argLen];
   p = buffer;
   for (unsigned int i=0;i<argLen;i++) {
-    const TCHAR *q = wcschr(p, (i<argLen-1)?splitChar:0);
+    const wchar_t *q = wcschr(p, (i<argLen-1)?splitChar:0);
     unsigned int len = static_cast<int>(q-p);
-    arrayBuffer[i] = new TCHAR[len+1];
+    arrayBuffer[i] = new wchar_t[len+1];
     wcsncpy_s(arrayBuffer[i], len+1, p, len);
     arrayBuffer[i][len] = 0;
@@ -140 +140 @@
   delete [] arrayBuffer[position];
   size_t len = argument.length();
-  arrayBuffer[position] = new TCHAR[len+2];
+  arrayBuffer[position] = new wchar_t[len+2];
   wcsncpy_s(arrayBuffer[position], len+1, argument.c_str(), len);
   arrayBuffer[position][len] = 0;
@@ -153 +153 @@
  * @return The arrayBuffer
  */
-arrayBuffer::arrayBuffer arrayBuffer::split2arrayBuffer(const std::wstring inBuf, TCHAR splitChar, unsigned int &argLen, bool escape) {
+arrayBuffer::arrayBuffer arrayBuffer::split2arrayBuffer(const std::wstring inBuf, wchar_t splitChar, unsigned int &argLen, bool escape) {
   if (inBuf.empty())
     return createEmptyArrayBuffer(argLen);
@@ -197 +197 @@
   for (std::list<std::wstring>::const_iterator cit=token_list.begin();cit!=token_list.end();++cit) {
     size_t len = (*cit).size();
-    TCHAR* token = new TCHAR[len+1];
+    wchar_t* token = new wchar_t[len+1];
     wcsncpy_s(token, len+1, (*cit).c_str(), len);
     arrayBuffer[argLen++] = token;
@@ -289 +289 @@
   std::wcout << "arrayBuffer::test_createEmptyArrayBuffer() : ";
   unsigned int argLen;
-  TCHAR ** c = createEmptyArrayBuffer(argLen);
+  wchar_t ** c = createEmptyArrayBuffer(argLen);
   if ((c) && (argLen == 0))
     std::wcout << "Succeeded" << std::endl;
@@ -302 +302 @@
  * @param OUT_argLen 
  */
-void arrayBuffer::test_split2arrayBuffer_str(std::wstring buffer, TCHAR splitter, int OUT_argLen) {
+void arrayBuffer::test_split2arrayBuffer_str(std::wstring buffer, wchar_t splitter, int OUT_argLen) {
   std::wcout << _T("arrayBuffer::test_split2arrayBuffer(") << buffer << _T(", ...) : ");
   unsigned int argLen = 0;
-  TCHAR ** c = split2arrayBuffer(buffer, splitter, argLen);
+  wchar_t ** c = split2arrayBuffer(buffer, splitter, argLen);
   if ((c) && (argLen == OUT_argLen))
     std::wcout << _T("Succeeded") << std::endl;
@@ -318 +318 @@
  * @param OUT_argLen 
  */
-void arrayBuffer::test_split2arrayBuffer_char(TCHAR* buffer, TCHAR splitter, int OUT_argLen) {
+void arrayBuffer::test_split2arrayBuffer_char(wchar_t* buffer, wchar_t splitter, int OUT_argLen) {
   std::wcout << _T("arrayBuffer::test_split2arrayBuffer(") << buffer << _T(", ...) : ");
   unsigned int argLen = 0;
-  TCHAR ** c = split2arrayBuffer(buffer, splitter, argLen);
+  wchar_t ** c = split2arrayBuffer(buffer, splitter, argLen);
   if ((c) && (argLen == OUT_argLen))
     std::wcout << _T("Succeeded") << std::endl;

trunk/include/arrayBuffer.h

@@ -20 +20 @@
 ***************************************************************************/
 #pragma once
-
-#include <tchar.h>
+#include <unicode_char.hpp>
 #include <string>
 #include <list>
@@ -54 +53 @@
     ArrayBufferException(std::wstring error) {}
   };
-  typedef TCHAR* arrayBufferItem;
+  typedef wchar_t* arrayBufferItem;
   typedef arrayBufferItem* arrayBuffer;
   typedef std::list<std::wstring> arrayList;
   void set(arrayBuffer arrayBuffer, const unsigned int argLen, const unsigned int position, std::wstring argument);
-  arrayList arrayBuffer2list(const unsigned int argLen, TCHAR **argument);
+  arrayList arrayBuffer2list(const unsigned int argLen, wchar_t **argument);
   arrayBuffer list2arrayBuffer(const arrayList lst, unsigned int &argLen);
-  arrayBuffer split2arrayBuffer(const TCHAR* buffer, TCHAR splitChar, unsigned int &argLen);
-  arrayBuffer split2arrayBuffer(const std::wstring inBuf, TCHAR splitChar, unsigned int &argLen, bool escape = false);
-  std::wstring arrayBuffer2string(TCHAR **argument, const unsigned int argLen, std::wstring join);
+  arrayBuffer split2arrayBuffer(const wchar_t* buffer, wchar_t splitChar, unsigned int &argLen);
+  arrayBuffer split2arrayBuffer(const std::wstring inBuf, wchar_t splitChar, unsigned int &argLen, bool escape = false);
+  std::wstring arrayBuffer2string(wchar_t **argument, const unsigned int argLen, std::wstring join);
   arrayBuffer createEmptyArrayBuffer(unsigned int &argLen);
   arrayBuffer createArrayBuffer(unsigned int &argLen);
@@ -70 +69 @@
     for (unsigned int i=0; i<argLen; i++) {
       size_t s = wcslen(other[i]);
-      ret[i] = new TCHAR[s+2];
+      ret[i] = new wchar_t[s+2];
       wcsncpy_s(ret[i], s+2, other[i], s);
     }
@@ -78 +77 @@
 #ifdef _DEBUG
   void test_createEmptyArrayBuffer();
-  void test_split2arrayBuffer_str(std::wstring buffer, TCHAR splitter, int OUT_argLen);
-  void test_split2arrayBuffer_char(TCHAR* buffer, TCHAR splitter, int OUT_argLen);
+  void test_split2arrayBuffer_str(std::wstring buffer, wchar_t splitter, int OUT_argLen);
+  void test_split2arrayBuffer_char(wchar_t* buffer, wchar_t splitter, int OUT_argLen);
   void run_testArrayBuffer();
 #endif

trunk/include/charEx.h

@@ -20 +20 @@
 ***************************************************************************/
 #pragma once
+#ifdef WIN32
 #include <windows.h>
 #include <tchar.h>
+#endif
 
 namespace charEx {
@@ -30 +32 @@
    * @return a list with strings
    */
-  inline std::list<std::wstring> split(const TCHAR* buffer, TCHAR split) {
+  inline std::list<std::wstring> split(const wchar_t* buffer, wchar_t split) {
     std::list<std::wstring> ret;
-    const TCHAR *start = buffer;
-    for (const TCHAR *p = buffer;*p!='\0';p++) {
+    const wchar_t *start = buffer;
+    for (const wchar_t *p = buffer;*p!='\0';p++) {
       if (*p==split) {
         std::wstring str(start, p-start);
@@ -44 +46 @@
   }
 
-
+/*
   inline char* tchar_to_char( const wchar_t* pStr, int len, int &nChars) {
     if (pStr == NULL)
@@ -78 +80 @@
       --nChars;
     if (nChars == 0) {
-      TCHAR *ret = new TCHAR[1];
+      wchar_t *ret = new wchar_t[1];
       ret[0] = 0;
       return ret;
@@ -84 +86 @@
 
     // convert the narrow string to a wide string 
-    TCHAR *ret = new TCHAR[nChars+1];
+    wchar_t *ret = new wchar_t[nChars+1];
     MultiByteToWideChar(CP_ACP, 0 ,pStr ,len, const_cast<wchar_t*>(ret), nChars);
     return ret;
   }
+*/
 
 
-
-  typedef std::pair<std::wstring,TCHAR*> token;
-  inline token getToken(TCHAR *buffer, TCHAR split) {
+  typedef std::pair<std::wstring,wchar_t*> token;
+  inline token getToken(wchar_t *buffer, wchar_t split) {
     if (buffer == NULL)
       throw std::exception();
-    TCHAR *p = wcschr(buffer, split);
+    wchar_t *p = wcschr(buffer, split);
     if (!p)
       return token(buffer, NULL);
@@ -104 +106 @@
   }
 #ifdef _DEBUG
-  inline void test_getToken(TCHAR* in1, TCHAR in2, std::wstring out1, TCHAR * out2) {
+  inline void test_getToken(wchar_t* in1, wchar_t in2, std::wstring out1, wchar_t * out2) {
     token t = getToken(in1, in2);
     std::wcout << _T("charEx::test_getToken(") << in1 << _T(", ") << in2 << _T(") : ");

trunk/include/checkHelpers.hpp

@@ -277 +277 @@
     }
     static std::wstring print(__int64 value) {
-      return strEx::itos(value);
+      return boost::lexical_cast<std::wstring>(value);
     }
     static std::wstring get_perf_unit(__int64 value) {
@@ -283 +283 @@
     }
     static std::wstring print_perf(__int64 value, std::wstring unit) {
-      return strEx::itos(value);
+      return boost::lexical_cast<std::wstring>(value);
     }
     static std::wstring print_unformated(__int64 value) {
-      return strEx::itos(value);
+      return boost::lexical_cast<std::wstring>(value);
     }
     static std::wstring print_percent(__int64 value) {
-      return strEx::itos(value) + _T("%");
+      return boost::lexical_cast<std::wstring>(value) + _T("%");
     }
     static std::wstring key_prefix() {

trunk/include/config.h

@@ -22 +22 @@
 
 #include "../AutoBuild.h"
+/*
 #include <tchar.h> 
+*/
 #include <string>
 #include <settings/macros.h>
@@ -197 +199 @@
 #define LUA_SCRIPT_SECTION_TITLE _T("LUA Scripts")
 */
-
-// Main Registry ROOT
-#define NS_HKEY_ROOT HKEY_LOCAL_MACHINE
-#define NS_REG_ROOT _T("SOFTWARE\\NSClient++")

trunk/include/error.hpp

@@ -1 +1 @@
 #pragma once
-#include <tchar.h>
+#include <unicode_char.hpp>
 #include <string>
-#include <windows.h>
 #include <strEx.h>
 #include <vector>
 
-namespace error {
-  class format {
-  public:
-    static std::wstring from_system(unsigned long dwError) {
-      LPVOID lpMsgBuf = NULL;
-      unsigned long dwRet = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,NULL,dwError,MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),(LPTSTR)&lpMsgBuf,0,NULL);
-      if (dwRet == 0) {
-        return _T("failed to lookup error code: ") + strEx::itos(dwError) + _T("( reson: ") + strEx::itos(GetLastError()) + _T(")");
-      }
-      TCHAR *szBuf = new TCHAR[dwRet + 100];
-      wsprintf(szBuf, _T("%d: %s"), dwError, lpMsgBuf); 
-      std::wstring str = szBuf;
-      delete [] szBuf;
-      LocalFree(lpMsgBuf);
-      return str;
-    }
-    static std::wstring from_module(std::wstring module, unsigned long dwError) {
-      LPVOID lpMsgBuf;
-      unsigned long dwRet = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_HMODULE|FORMAT_MESSAGE_IGNORE_INSERTS,
-        GetModuleHandle(module.c_str()),dwError,MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),(LPTSTR)&lpMsgBuf,0,NULL);
-      if (dwRet == 0) {
-        return _T("failed to lookup error code: ") + strEx::itos(dwError) + _T("( reson: ") + strEx::itos(GetLastError()) + _T(")");
-      }
-      TCHAR *szBuf = new TCHAR[dwRet + 100];
-      wsprintf(szBuf, _T("%d: %s"), dwError, lpMsgBuf); 
-      std::wstring str = szBuf;
-      delete [] szBuf;
-      LocalFree(lpMsgBuf);
-      return str;
-    }
-    static std::wstring from_module(std::wstring module, unsigned long dwError, DWORD *arguments) {
-      LPVOID lpMsgBuf;
-      HMODULE hevt = LoadLibraryEx(module.c_str(), NULL, DONT_RESOLVE_DLL_REFERENCES);
-      if (hevt == NULL) {
-        return _T("failed to load: ") + module + _T("( reson: ") + strEx::itos(GetLastError()) + _T(")");
-      }
-      unsigned long dwRet = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_HMODULE|FORMAT_MESSAGE_ARGUMENT_ARRAY,hevt,
-        dwError,MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),(LPTSTR)&lpMsgBuf,0,reinterpret_cast<va_list*>(arguments));
-      if (dwRet == 0) {
-        FreeLibrary(hevt);
-        return _T("failed to lookup error code: ") + strEx::itos(dwError) + _T(" from DLL: ") + module + _T("( reson: ") + strEx::itos(GetLastError()) + _T(")");
-      }
-      TCHAR *szBuf = new TCHAR[dwRet + 100];
-      wsprintf(szBuf, _T("%d: %s"), dwError, lpMsgBuf); 
-      std::wstring str = szBuf;
-      delete [] szBuf;
-      LocalFree(lpMsgBuf);
-      FreeLibrary(hevt);
-      return str;
-    }
-    class message {
-    public:
-      static std::wstring from_module(std::wstring module, unsigned long dwError) {
-        HMODULE hDLL = LoadLibraryEx(module.c_str(), NULL, DONT_RESOLVE_DLL_REFERENCES);
-        if (hDLL == NULL) {
-          return _T("failed to load: ") + module + _T("( reson: ") + strEx::itos(GetLastError()) + _T(")");
-        }
-        LPVOID lpMsgBuf;
-        unsigned long dwRet = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_HMODULE|FORMAT_MESSAGE_IGNORE_INSERTS,hDLL,
-          dwError,MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),(LPTSTR)&lpMsgBuf,0,NULL);
-        if (dwRet == 0) {
-          FreeLibrary(hDLL);
-          DWORD err = GetLastError();
-          if (err == 317) {
-            return _T("");
-          }
-          return _T("failed to lookup error code: ") + strEx::itos(dwError) + _T(" from DLL: ") + module + _T("( reson: ") + strEx::itos(err) + _T(")");
-        }
-        std::wstring str = reinterpret_cast<TCHAR*>(lpMsgBuf);
-        LocalFree(lpMsgBuf);
-        FreeLibrary(hDLL);
-        return str;
-      }
-
-      static std::wstring from_module_x64(std::wstring module, unsigned long dwError, TCHAR* argList[], DWORD argCount) {
-        if (argCount == 0)
-          return from_module_wrapper(module, dwError);
-        if (argCount == 1)
-          return from_module_wrapper(module, dwError, argList[0]);
-        if (argCount == 2)
-          return from_module_wrapper(module, dwError, argList[0], argList[1]);
-        if (argCount == 3)
-          return from_module_wrapper(module, dwError, argList[0], argList[1], argList[2]);
-        if (argCount == 4)
-          return from_module_wrapper(module, dwError, argList[0], argList[1], argList[2], argList[3]);
-        if (argCount == 5)
-          return from_module_wrapper(module, dwError, argList[0], argList[1], argList[2], argList[3], argList[4]);
-        if (argCount == 6)
-          return from_module_wrapper(module, dwError, argList[0], argList[1], argList[2], argList[3], argList[4], argList[5]);
-        if (argCount == 7)
-          return from_module_wrapper(module, dwError, argList[0], argList[1], argList[2], argList[3], argList[4], argList[5], argList[6]);
-        if (argCount == 8)
-          return from_module_wrapper(module, dwError, argList[0], argList[1], argList[2], argList[3], argList[4], argList[5], argList[6], argList[7]);
-        if (argCount == 9)
-          return from_module_wrapper(module, dwError, argList[0], argList[1], argList[2], argList[3], argList[4], argList[5], argList[6], argList[7], argList[8]);
-        if (argCount == 10)
-          return from_module_wrapper(module, dwError, argList[0], argList[1], argList[2], argList[3], argList[4], argList[5], argList[6], argList[7], argList[8], argList[9]);
-        if (argCount == 11)
-          return from_module_wrapper(module, dwError, argList[0], argList[1], argList[2], argList[3], argList[4], argList[5], argList[6], argList[7], argList[8], argList[9], argList[10]);
-        return _T("We cant handle ") + strEx::itos(argCount) + _T(" arguments so you wont get argList here");
-      }
-    private:
-
-      static std::wstring from_module_wrapper(std::wstring module, unsigned long dwError, ...) {
-        va_list Ellipsis;
-        va_start(Ellipsis, dwError);
-        std::wstring ret = __from_module(module, dwError, &Ellipsis);
-        va_end(Ellipsis);
-        return ret;
-      }
-
-      static std::wstring __from_module(std::wstring module, unsigned long dwError, va_list *arguments) {
-        HMODULE hDLL = LoadLibraryEx(module.c_str(), NULL, DONT_RESOLVE_DLL_REFERENCES);
-        if (hDLL == NULL) {
-          return _T("failed to load: ") + module + _T("( reson: ") + strEx::itos(GetLastError()) + _T(")");
-        }
-        LPVOID lpMsgBuf;
-
-        //unsigned long dwRet = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_HMODULE|FORMAT_MESSAGE_ARGUMENT_ARRAY,hDLL,
-        //  dwError,MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),(LPTSTR)&lpMsgBuf,0,reinterpret_cast<va_list*>(arguments));
-        unsigned long dwRet = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_HMODULE,hDLL,
-          dwError,MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),(LPTSTR)&lpMsgBuf,0,reinterpret_cast<va_list*>(arguments));
-        if (dwRet == 0) {
-          FreeLibrary(hDLL);
-          DWORD err = GetLastError();
-          if (err == 317) {
-            return _T("");
-          }
-          return _T("failed to lookup error code: ") + strEx::itos(dwError) + _T(" from DLL: ") + module + _T("( reson: ") + strEx::itos(err) + _T(")");
-        }
-        std::wstring str = reinterpret_cast<TCHAR*>(lpMsgBuf);
-        LocalFree(lpMsgBuf);
-        FreeLibrary(hDLL);
-        return str;
-      }
-    public:
-      static std::wstring from_system(unsigned long dwError, DWORD *arguments) {
-        LPVOID lpMsgBuf;
-        unsigned long dwRet = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM|FORMAT_MESSAGE_ARGUMENT_ARRAY,NULL,
-          dwError,MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),(LPTSTR)&lpMsgBuf,0,reinterpret_cast<va_list*>(arguments));
-        if (dwRet == 0) {
-          DWORD err = GetLastError();
-          if (err == 317) {
-            return _T("");
-          }
-          return _T("failed to lookup error code: ") + strEx::itos(dwError) + _T(" from system ( reson: ") + strEx::itos(err) + _T(")");
-        }
-        std::wstring str = reinterpret_cast<TCHAR*>(lpMsgBuf);
-        LocalFree(lpMsgBuf);
-        return str;
-      }
-    };
-  };
-  class lookup {
-  public:
-    static std::wstring last_error(unsigned long dwLastError = -1) {
-      if (dwLastError == -1) {
-        dwLastError = GetLastError();
-      }
-      return ::error::format::from_system(dwLastError);
-    }
-    static std::string last_error_ansi(unsigned long dwLastError = -1) {
-      if (dwLastError == -1) {
-        dwLastError = GetLastError();
-      }
-      return strEx::wstring_to_string(::error::format::from_system(dwLastError));
-    }
-  };
-}
+#ifdef WIN32
+#include <error_impl_w32.hpp>
+#else
+#include <error_impl_unix.hpp>
+#endif

trunk/include/nrpe/nrpepacket.hpp

@@ -148 +148 @@
   unsigned int getBufferLength() const { return getBufferLength(buffer_length_); }
   static unsigned int getBufferLength(unsigned int buffer_length) { return sizeof(packet)+buffer_length*sizeof(char); }
+  unsigned int getInternalBufferLength() const { return buffer_length_; }
 
 

trunk/include/settings/macros.h

@@ -1 +1 @@
 #pragma once
 
-
+#include <unicode_char.hpp>
 
 #define DEFINE_SETTING_S(name, path, key, value) \
@@ -39 +39 @@
   setting_keys::key ## _PATH, setting_keys::key, type, setting_keys::key ## _TITLE, setting_keys::key ## _DESC, setting_keys::key ## _DEFAULT, setting_keys::key ## _ADVANCED
 #define SETTINGS_REG_KEY_I_GEN(key, type) \
-  setting_keys::key ## _PATH, setting_keys::key, type, setting_keys::key ## _TITLE, setting_keys::key ## _DESC, strEx::itos(setting_keys::key ## _DEFAULT), setting_keys::key ## _ADVANCED
+  setting_keys::key ## _PATH, setting_keys::key, type, setting_keys::key ## _TITLE, setting_keys::key ## _DESC, boost::lexical_cast<std::wstring>(setting_keys::key ## _DEFAULT), setting_keys::key ## _ADVANCED
 #define SETTINGS_REG_KEY_B_GEN(key, type) \
   setting_keys::key ## _PATH, setting_keys::key, type, setting_keys::key ## _TITLE, setting_keys::key ## _DESC, setting_keys::key ## _DEFAULT==1?_T("1"):_T("0"), setting_keys::key ## _ADVANCED
@@ -57 +57 @@
 #define GENERIC_KEY_OBFUSCATED_PWD "obfuscated password"
 #define GENERIC_KEY_USE_SSL "use ssl"
+
+
+// Main Registry ROOT
+#define NS_HKEY_ROOT HKEY_LOCAL_MACHINE
+#define NS_REG_ROOT _T("SOFTWARE\\NSClient++")
 
 
@@ -217 +222 @@
     DESCRIBE_SETTING(SYNTAX, "SYNTAX", "Set this to use a specific syntax string for all commands (that don't specify one).");
 
-    DEFINE_SETTING_I(BUFFER_SIZE, EVENT_LOG_SECTION, "buffer_size", 4096);
+    DEFINE_SETTING_I(BUFFER_SIZE, EVENT_LOG_SECTION, "buffer_size", 65535);
     DESCRIBE_SETTING(BUFFER_SIZE, "BUFFER SIZE", "The size of the bugfer to use when getting messages this affects the speed and maximum size of messages you can recieve.");
   }

trunk/include/settings/settings_old.hpp

@@ -5 +5 @@
 #include <settings/Settings.h>
 #include <simpleini/SimpleIni.h>
+#include <settings/macros.h>
 
 #define MAIN_MODULES_SECTION_OLD _T("modules")

trunk/include/settings/settings_registry.hpp

@@ -6 +6 @@
 #include <msvc_wrappers.h>
 #include <error.hpp>
+#include <settings/macros.h>
 #define BUFF_LEN 4096
 

trunk/include/strEx.h

@@ -20 +20 @@
 ***************************************************************************/
 #pragma once
-
-#include <tchar.h>
-#include <windows.h>
+#include <unicode_char.hpp>
 #include <sstream>
 #include <iomanip>
@@ -32 +30 @@
 #include <algorithm>
 #include <locale>
+#include <iostream>
+#include <string>
+#include <locale> 
+#include <boost/lexical_cast.hpp>
+#include <boost/date_time.hpp>
+#include <boost/lexical_cast.hpp>
+//#include <boost/date_time/local_time/local_date_time.hpp>
+//#include <boost/date_time/gregorian/conversion.hpp>
+//boost::local_time::local_date_time 
 
 
@@ -38 +45 @@
 #endif
 
+
+
+
+#include <string>
+#include <locale>
+
+namespace boost
+{
+  template<>
+  inline std::wstring lexical_cast<std::wstring, std::string>(const std::string& arg)
+  {
+    std::wstring result;
+    std::locale loc;
+    for(unsigned int i= 0; i < arg.size(); ++i)
+    {
+      result += std::use_facet<std::ctype<wchar_t> >(loc).widen(arg[i]);
+    }
+    return result;
+  }
+
+  template<>
+  inline std::string lexical_cast<std::string, std::wstring>(const std::wstring& arg)
+  {
+    std::string result;
+    std::locale loc;
+    for(unsigned int i= 0; i < arg.size(); ++i)
+    {
+      result += std::use_facet<std::ctype<wchar_t> >(loc).narrow(arg[i]);
+    }
+    return result;
+  }
+}
 namespace strEx {
   class string_exception : public std::exception {
@@ -46 +85 @@
       return _what;
     }
+    virtual ~string_exception() throw();
   };
   namespace s {
@@ -72 +112 @@
     lst += append;
   }
-
+/*
   inline std::string wstring_to_string( const wchar_t* pStr, int len) {
     if (pStr == NULL)
@@ -95 +135 @@
     return buf ; 
   }
+  */
   inline std::string wstring_to_string( const std::wstring& str ) {
-    return wstring_to_string(str.c_str(), static_cast<int>(str.length()));
-  }
-
+    return boost::lexical_cast<std::string>(str) ;
+    //return wstring_to_string(str.c_str(), static_cast<int>(str.length()));
+  }
+/*
   inline std::wstring string_to_wstring( const char* pStr , int len ) {
     if (pStr == NULL)
@@ -120 +162 @@
     return buf ;
   }
+  */
   inline std::wstring string_to_wstring( const std::string& str ) {
-    return string_to_wstring(str.c_str(), static_cast<int>(str.length())) ;
+    return boost::lexical_cast<std::wstring>(str) ;
+    //return string_to_wstring(str.c_str(), static_cast<int>(str.length())) ;
   }
 
@@ -164 +208 @@
     return ss.str();
   }
-
-  inline std::wstring format_date(time_t time, std::wstring format = _T("%Y-%m-%d %H:%M:%S")) {
-    TCHAR buf[51];
+  inline std::wstring format_date(boost::posix_time::ptime date, std::wstring format = _T("%Y-%m-%d %H:%M:%S")) {
+    std::locale locale_local ("");
+
+    boost::gregorian::wdate_facet *date_output = new boost::gregorian::wdate_facet();
+    std::locale locale_adjusted (locale_local, date_output);
+
+    std::wstringstream date_ss;
+    date_ss.imbue(locale_adjusted);
+
+    date_output->format(format.c_str());
+    date_ss << date;
+
+    std::wstring ss = date_ss.str();
+    return ss;
+  }
+
+
+  inline std::wstring format_date(std::time_t time, std::wstring format = _T("%Y-%m-%d %H:%M:%S")) {
+    return format_date(boost::posix_time::from_time_t(time), format);
+    /*
+    wchar_t buf[51];
     struct tm nt; // = new struct tm;
 #if (_MSC_VER > 1300)  // 1300 == VC++ 7.0
@@ -172 +234 @@
       return _T("");
 #else
+    struct tm nt; // = new struct tm;
     nt = gmtime(&time);
     if (nt == NULL)
@@ -181 +244 @@
     buf[l] = 0;
     return buf;
-  }
+    */
+  }
+  /*
   inline std::wstring format_date(const SYSTEMTIME &time, std::wstring format = _T("%Y-%m-%d %H:%M:%S")) {
-    TCHAR buf[51];
-
     struct tm tmTime;
     memset(&tmTime, 0, sizeof(tmTime));
@@ -205 +268 @@
   static const __int64 SECS_BETWEEN_EPOCHS = 11644473600;
   static const __int64 SECS_TO_100NS = 10000000;
+  inline std::wstring format_filetime(unsigned long long filetime, std::wstring format = _T("%Y-%m-%d %H:%M:%S")) {
+    filetime -= (SECS_BETWEEN_EPOCHS * SECS_TO_100NS);
+    filetime /= SECS_TO_100NS;
+    return format_date(static_cast<time_t>(filetime), format);
+  }
+*/
+  static const __int64 SECS_BETWEEN_EPOCHS = 11644473600;
+  static const __int64 SECS_TO_100NS = 10000000;
+
   inline std::wstring format_filetime(unsigned long long filetime, std::wstring format = _T("%Y-%m-%d %H:%M:%S")) {
     filetime -= (SECS_BETWEEN_EPOCHS * SECS_TO_100NS);
@@ -222 +294 @@
     }
   }
-  inline std::wstring ctos(TCHAR c) {
+  inline std::wstring ctos(wchar_t c) {
     return std::wstring(1, c);
   }
-  inline TCHAR stoc(std::wstring str) {
+  inline wchar_t stoc(std::wstring str) {
     if (str.length() == 0)
       return L' ';
@@ -245 +317 @@
     return ss.str();
   }
+  /*
   inline std::wstring itos(__int64 i) {
     std::wstringstream ss;
@@ -250 +323 @@
     return ss.str();
   }
+  */
   inline std::wstring itos(unsigned long i) {
     std::wstringstream ss;
@@ -284 +358 @@
   }
   inline int stoi(std::wstring s) {
-    return _wtoi(s.c_str());
+    return boost::lexical_cast<int>(s.c_str());
   }
   inline double stod(std::wstring s) {
-    return _wtof(s.c_str());
+    return boost::lexical_cast<double>(s.c_str());
   }
   inline long long stoi64(std::wstring s) {
-    return _wtoi64(s.c_str());
+    return boost::lexical_cast<long long>(s.c_str());
   }
   inline unsigned stoui_as_time(std::wstring time, unsigned int smallest_unit = 1000) {
     std::wstring::size_type p = time.find_first_of(_T("sSmMhHdDwW"));
-    unsigned int value = _wtoi(time.c_str());
+    unsigned int value = boost::lexical_cast<unsigned int>(time.c_str());
     if (p == std::wstring::npos)
       return value * smallest_unit;
@@ -312 +386 @@
   inline unsigned long long stoi64_as_time(std::wstring time, unsigned int smallest_unit = 1000) {
     std::wstring::size_type p = time.find_first_of(_T("sSmMhHdDwW"));
-    unsigned long long value = _wtoi64(time.c_str());
     if (p == std::wstring::npos)
-      return value * smallest_unit;
-    else if ( (time[p] == 's') || (time[p] == 'S') )
+      return boost::lexical_cast<long long>(time) * smallest_unit;
+    unsigned long long value = boost::lexical_cast<long long>(time.substr(0, p));
+    if ( (time[p] == 's') || (time[p] == 'S') )
       return value * 1000;
     else if ( (time[p] == 'm') || (time[p] == 'M') )
@@ -378 +452 @@
     std::wstring::size_type p = s.find_first_of(_T("BMKGT"));
     if (p == std::wstring::npos)
-      return _wtoi64(s.c_str());
+      return boost::lexical_cast<long long>(s.c_str());
     else if (s[p] == 'B') 
-      return _wtoi64(s.c_str());
+      return boost::lexical_cast<long long>(s.c_str());
     else if (s[p] == 'K') 
-      return _wtoi64(s.c_str())*1024;
+      return boost::lexical_cast<long long>(s.c_str())*1024;
     else if (s[p] == 'M') 
-      return _wtoi64(s.c_str())*1024*1024;
+      return boost::lexical_cast<long long>(s.c_str())*1024*1024;
     else if (s[p] == 'G') 
-      return _wtoi64(s.c_str())*1024*1024*1024;
+      return boost::lexical_cast<long long>(s.c_str())*1024*1024*1024;
     else if (s[p] == 'T') 
-      return _wtoi64(s.c_str())*1024*1024*1024*1024;
+      return boost::lexical_cast<long long>(s.c_str())*1024*1024*1024*1024;
     else
-      return _wtoi64(s.c_str());
-  }
-#define BKMG_RANGE "BKMGTP"
+      return boost::lexical_cast<long long>(s.c_str());
+  }
+#define BKMG_RANGE _T("BKMGTP")
 #define BKMG_SIZE 5
 
-  inline std::wstring itos_as_BKMG(unsigned __int64 i) {
+  inline std::wstring itos_as_BKMG(unsigned long long i) {
     double cpy = static_cast<double>(i);
-    TCHAR postfix[] = _T(BKMG_RANGE);
+    wchar_t postfix[] = BKMG_RANGE;
     int idx = 0;
     while ((cpy > 999)&&(idx<BKMG_SIZE)) {
@@ -410 +484 @@
     return ret;
   }
-  inline std::wstring format_BKMG(unsigned __int64 i, std::wstring unit) {
+  inline std::wstring format_BKMG(unsigned long long i, std::wstring unit) {
     double cpy = static_cast<double>(i);
-    TCHAR postfix[] = _T(BKMG_RANGE);
+    wchar_t postfix[] = BKMG_RANGE;
     if (unit.length() != 1)
       return itos(cpy);
@@ -430 +504 @@
     return itos(cpy);
   }
-  inline std::wstring find_proper_unit_BKMG(unsigned __int64 i) {
+  inline std::wstring find_proper_unit_BKMG(unsigned long long i) {
     double cpy = static_cast<double>(i);
-    TCHAR postfix[] = _T(BKMG_RANGE);
+    wchar_t postfix[] = BKMG_RANGE;
     int idx = 0;
     while ((cpy > 999)&&(idx<BKMG_SIZE)) {
@@ -523 +597 @@
 
     //  There's no memichr(), so we roll our own.  It ain't rocket science.
-    static const _E * __cdecl find(const _E *buf, size_t len, const _E& ch) {
+    static const _E * /*__cdecl*/ find(const _E *buf, size_t len, const _E& ch) {
       //  Jerry says that x86s have special mojo for memchr(), so the 
       //  memchr() calls end up being reasonably efficient in practice.
@@ -539 +613 @@
 
     //  I'm reasonably sure that this is eq() for wide characters.  Maybe.
-    static bool eq_int_type(const int_type& ch1, const int_type& ch2) { 
-      return char_traits<_E>::eq_int_type( tolower( ch1 ), tolower( ch2 ) ); 
+    static bool eq_int_type(const long& ch1, const long& ch2) { 
+      return std::char_traits<_E>::eq_int_type( tolower( ch1 ), tolower( ch2 ) ); 
     }
   };
@@ -547 +621 @@
   //typedef std::basic_string<char, blind_traits<char>, std::allocator<char> >  blindstr;
   typedef std::basic_string<wchar_t, blind_traits<wchar_t>, std::allocator<wchar_t> >  blindstr;
-
-  struct case_blind_string_compare : public std::binary_function<std::wstring, std::wstring, bool>
-  {
-    bool operator() (const std::wstring& x, const std::wstring& y) const {
-      return _wcsicmp( x.c_str(), y.c_str() ) < 0;
-    }
-  };
-
-
 
   class StrICmp
@@ -596 +661 @@
   }
 
+  struct case_blind_string_compare : public std::binary_function<std::wstring, std::wstring, bool>
+  {
+    bool operator() (const std::wstring& x, const std::wstring& y) const {
+      return StrCmpI<std::wstring>(x,y);
+      //return _wcsicmp( x.c_str(), y.c_str() ) < 0;
+    }
+  };
 
 #ifdef _DEBUG
@@ -635 +707 @@
 }
 
-
-#include <string>
-#include <locale>
-
-#include <boost/lexical_cast.hpp>
-
-namespace boost
-{
-  template<>
-  inline std::wstring lexical_cast<std::wstring, std::string>(const std::string& arg)
-  {
-    std::wstring result;
-    std::locale loc;
-    for(unsigned int i= 0; i < arg.size(); ++i)
-    {
-      result += std::use_facet<std::ctype<wchar_t> >(loc).widen(arg[i]);
-    }
-    return result;
-  }
-
-  template<>
-  inline std::string lexical_cast<std::string, std::wstring>(const std::wstring& arg)
-  {
-    std::string result;
-    std::locale loc;
-    for(unsigned int i= 0; i < arg.size(); ++i)
-    {
-      result += std::use_facet<std::ctype<wchar_t> >(loc).narrow(arg[i]);
-    }
-    return result;
+template <typename T> std::string to_string(const T& arg) {
+  try {
+    return boost::lexical_cast<std::string>(arg) ;
+  }
+  catch(boost::bad_lexical_cast& e) {
+    return "";
   }
 }
-
+template <typename T> std::wstring to_wstring(const T& arg) {
+  try {
+    return boost::lexical_cast<std::wstring>(arg) ;
+  }
+  catch(boost::bad_lexical_cast& e) {
+    return _T("");
+  }
+}

trunk/modules/CheckDisk/CheckDisk.cpp

@@ -680 +680 @@
   unsigned long long now = ((now_.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)now_.dwLowDateTime);
   time_t value = (now-finder.info.ullLastWriteTime)/10000000;
-  message = strEx::itos(value/60) + _T("&") + strEx::format_time_delta(gmtime(&value), format);
+  message = to_wstring(value/60) + _T("&") + strEx::format_time_delta(gmtime(&value), format);
   return NSCAPI::returnOK;
 }

trunk/modules/CheckDisk/stdafx.h

@@ -30 +30 @@
 #include <NSCAPI.h>
 #include <NSCHelper.h>
+#include <nsc_module_wrapper.hpp>
 
 #ifdef MEMCHECK

trunk/modules/CheckEventLog/CheckEventLog.cpp

@@ -361 +361 @@
     return ret;
   }
-  SYSTEMTIME get_time(DWORD time) {
+  // SYSTEMTIME 
+  boost::posix_time::ptime get_time(DWORD time) {
     FILETIME FileTime, LocalFileTime;
     SYSTEMTIME SysTime;
@@ -372 +373 @@
     FileTime.dwHighDateTime = (DWORD)(lgTemp >> 32);
 
+    return boost::date_time::time_from_ftime<boost::posix_time::ptime>(FileTime);
+
+
+/*
     FileTimeToLocalFileTime(&FileTime, &LocalFileTime);
     FileTimeToSystemTime(&LocalFileTime, &SysTime);
     return SysTime;
-  }
-
-  SYSTEMTIME get_time_generated() {
+    */
+  }
+
+  boost::posix_time::ptime get_time_generated() {
     return get_time(pevlr_->TimeGenerated);
   }
-  SYSTEMTIME get_time_written() {
+  boost::posix_time::ptime get_time_written() {
     return get_time(pevlr_->TimeWritten);
   }

trunk/modules/CheckEventLog/stdafx.h

@@ -34 +34 @@
 
 #include <NSCAPI.h>
+#include <nsc_module_wrapper.hpp>
 #include <NSCHelper.h>
 

trunk/modules/CheckExternalScripts

@@ -1 +1 @@
 *.user
+Debug

@@ -1 +1 @@
 *.user
+Debug

trunk/modules/CheckExternalScripts/CheckExternalScripts-2005.vcproj

@@ -49 +49 @@
         Name="VCCLCompilerTool"
         AdditionalIncludeDirectories="../include;../../include"
+        PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;USE_BOOST"
       />
       <Tool
@@ -114 +115 @@
         Name="VCCLCompilerTool"
         AdditionalIncludeDirectories="../include;../../include"
+        PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;USE_BOOST"
       />
       <Tool
@@ -127 +129 @@
         Name="VCLinkerTool"
         AdditionalDependencies="ws2_32.lib ssleay32.lib libeay32.lib"
+      />
+      <Tool
+        Name="VCALinkTool"
+      />
+      <Tool
+        Name="VCManifestTool"
+      />
+      <Tool
+        Name="VCXDCMakeTool"
+      />
+      <Tool
+        Name="VCBscMakeTool"
+      />
+      <Tool
+        Name="VCFxCopTool"
+      />
+      <Tool
+        Name="VCAppVerifierTool"
+      />
+      <Tool
+        Name="VCWebDeploymentTool"
+      />
+      <Tool
+        Name="VCPostBuildEventTool"
+      />
+    </Configuration>
+    <Configuration
+      Name="Debug|Win32"
+      OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+      IntermediateDirectory="$(ConfigurationName)"
+      ConfigurationType="2"
+      CharacterSet="1"
+      >
+      <Tool
+        Name="VCPreBuildEventTool"
+      />
+      <Tool
+        Name="VCCustomBuildTool"
+      />
+      <Tool
+        Name="VCXMLDataGeneratorTool"
+      />
+      <Tool
+        Name="VCWebServiceProxyGeneratorTool"
+      />
+      <Tool
+        Name="VCMIDLTool"
+      />
+      <Tool
+        Name="VCCLCompilerTool"
+        AdditionalIncludeDirectories="../include;../../include"
+        PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;USE_BOOST"
+      />
+      <Tool
+        Name="VCManagedResourceCompilerTool"
+      />
+      <Tool
+        Name="VCResourceCompilerTool"
+      />
+      <Tool
+        Name="VCPreLinkEventTool"
+      />
+      <Tool
+        Name="VCLinkerTool"
+      />
+      <Tool
+        Name="VCALinkTool"
+      />
+      <Tool
+        Name="VCManifestTool"
+      />
+      <Tool
+        Name="VCXDCMakeTool"
+      />
+      <Tool
+        Name="VCBscMakeTool"
+      />
+      <Tool
+        Name="VCFxCopTool"
+      />
+      <Tool
+        Name="VCAppVerifierTool"
+      />
+      <Tool
+        Name="VCWebDeploymentTool"
+      />
+      <Tool
+        Name="VCPostBuildEventTool"
+      />
+    </Configuration>
+    <Configuration
+      Name="Debug|x64"
+      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      ConfigurationType="2"
+      CharacterSet="1"
+      >
+      <Tool
+        Name="VCPreBuildEventTool"
+      />
+      <Tool
+        Name="VCCustomBuildTool"
+      />
+      <Tool
+        Name="VCXMLDataGeneratorTool"
+      />
+      <Tool
+        Name="VCWebServiceProxyGeneratorTool"
+      />
+      <Tool
+        Name="VCMIDLTool"
+      />
+      <Tool
+        Name="VCCLCompilerTool"
+        AdditionalIncludeDirectories="../include;../../include"
+        PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_STLP_USE_NEWALLOC;_STLP_DEBUG=1;USE_BOOST"
+      />
+      <Tool
+        Name="VCManagedResourceCompilerTool"
+      />
+      <Tool
+        Name="VCResourceCompilerTool"
+      />
+      <Tool
+        Name="VCPreLinkEventTool"
+      />
+      <Tool
+        Name="VCLinkerTool"
       />
       <Tool

trunk/modules/CheckExternalScripts/stdafx.h

@@ -30 +30 @@
 #include <utils.h>
 
+#include <boost/lexical_cast.hpp>
+
 #include <NSCAPI.h>
+#include <nsc_module_wrapper.hpp>
 #include <NSCHelper.h>
 

trunk/modules/CheckHelpers/stdafx.h

@@ -29 +29 @@
 
 #include <NSCAPI.h>
+#include <nsc_module_wrapper.hpp>
 #include <NSCHelper.h>
 

trunk/modules/CheckSystem/CheckSystem.cpp

@@ -365 +365 @@
   }
   static std::wstring print_perf(__int64 value, std::wstring unit) {
-    return strEx::itos(value);
+    return to_wstring(value);
   }
   static std::wstring print_percent(int value) {
-    return strEx::itos(value) + _T("%");
+    return to_wstring(value) + _T("%");
   }
   static std::wstring key_prefix() {

trunk/modules/CheckSystem/stdafx.h

@@ -35 +35 @@
 #include <list>
 #include <NSCAPI.h>
+#include <nsc_module_wrapper.hpp>
 #include <NSCHelper.h>
 #include <config.h>

trunk/modules/CheckTaskSched/stdafx.h

@@ -35 +35 @@
 #include <NSCAPI.h>
 #include <NSCHelper.h>
+#include <nsc_module_wrapper.hpp>
 #include <checkHelpers.hpp>
 #include <filter_framework.hpp>

trunk/modules/CheckWMI/WMIQuery.h

@@ -101 +101 @@
     void setString(std::wstring a, std::wstring s) {
       string = s;
-      numeric = strEx::stoi64(s);
+      numeric = boost::lexical_cast<long long>(s);
       alias = a;
     }
     void setNumeric(std::wstring a, long long n) {
       numeric = n;
-      string = strEx::itos(n);
+      string = to_wstring(n);
       alias = a;
     }

trunk/modules/CheckWMI/stdafx.h

@@ -35 +35 @@
 #include <NSCAPI.h>
 #include <NSCHelper.h>
+#include <nsc_module_wrapper.hpp>
 #include <checkHelpers.hpp>
 #include <filter_framework.hpp>

trunk/modules/DebugLogMetrics/stdafx.h

@@ -33 +33 @@
 #include <NSCAPI.h>
 #include <NSCHelper.h>
+#include <nsc_module_wrapper.hpp>
 
 #ifdef MEMCHECK

trunk/modules/FileLogger/stdafx.h

@@ -27 +27 @@
 #include <NSCAPI.h>
 #include <NSCHelper.h>
+#include <nsc_module_wrapper.hpp>
 #include <string>
 #include <iostream>

trunk/modules/LUAScript/stdafx.h

@@ -30 +30 @@
 #include <NSCAPI.h>
 #include <NSCHelper.h>
+#include <nsc_module_wrapper.hpp>
 
 #ifdef MEMCHECK

trunk/modules/NRPEClient/NRPEClient.cpp

@@ -186 +186 @@
 #endif
 
-using boost::asio::ip::tcp;
 
 int NRPEClient::commandLineExec(const TCHAR* command, const unsigned int argLen, TCHAR** args) {
@@ -246 +245 @@
   }
 }
+/*
 NRPEPacket NRPEClient::send_ssl(std::wstring host, int port, int timeout, NRPEPacket packet)
 {
@@ -251 +251 @@
   return send_nossl(host, port, timeout, packet);
 #else
+  
   initSSL();
   simpleSSL::Socket socket(true);
@@ -261 +262 @@
   packet.readFrom(buffer.getBuffer(), buffer.getLength());
   return packet;
-#endif
-}
-
+  
+
+  boost::asio::ssl::context ctx(io_service, boost::asio::ssl::context::sslv23);
+  ctx.use_tmp_dh_file("d:\\nrpe_512.pem");
+  ctx.set_verify_mode(boost::asio::ssl::context::verify_peer);
+  nrpe_ssl_socket socket(io_service, ctx, host, port);
+  //socket.
+
+#endif
+}
+*/
+using boost::asio::ip::tcp;
 
 void set_result(boost::optional<boost::system::error_code>* a, boost::system::error_code b)
@@ -269 +279 @@
   a->reset(b);
 } 
-template <typename MutableBufferSequence>
-void read_with_timeout(tcp::socket& sock, const MutableBufferSequence& buffers, boost::posix_time::time_duration duration)
+template <typename AsyncReadStream, typename RawSocket, typename MutableBufferSequence>
+void read_with_timeout(AsyncReadStream& sock, RawSocket& rawSocket, const MutableBufferSequence& buffers, boost::posix_time::time_duration duration)
 {
   boost::optional<boost::system::error_code> timer_result;
@@ -286 +296 @@
       timer.cancel();
     else if (timer_result)
-      sock.close();
+      rawSocket.close();
   }
 
@@ -293 +303 @@
 } 
 
+template <typename AsyncWriteStream, typename RawSocket, typename MutableBufferSequence>
+void write_with_timeout(AsyncWriteStream& sock, RawSocket& rawSocket, const MutableBufferSequence& buffers, boost::posix_time::time_duration duration)
+{
+  boost::optional<boost::system::error_code> timer_result;
+  boost::asio::deadline_timer timer(sock.io_service());
+  timer.expires_from_now(duration);
+  timer.async_wait(boost::bind(set_result, &timer_result, _1));
+
+  boost::optional<boost::system::error_code> read_result;
+  async_write(sock, buffers, boost::bind(set_result, &read_result, _1));
+
+  sock.io_service().reset();
+  while (sock.io_service().run_one())
+  {
+    if (read_result)
+      timer.cancel();
+    else if (timer_result)
+      rawSocket.close();
+  }
+
+  if (*read_result)
+    throw boost::system::system_error(*read_result);
+}
+
+class nrpe_socket : public boost::noncopyable {
+public:
+  tcp::socket socket_;
+
+public:
+  nrpe_socket(boost::asio::io_service &io_service, std::wstring host, int port) : socket_(io_service) {
+    NSC_LOG_CRITICAL(_T("Looking up..."));
+    tcp::resolver resolver(io_service);
+    tcp::resolver::query query(to_string(host), to_string(port));
+    //tcp::resolver::query query("www.medin.name", "80");
+    //tcp::resolver::query query("test_server", "80");
+
+    tcp::resolver::iterator endpoint_iterator = resolver.resolve(query);
+    tcp::resolver::iterator end;
+
+    NSC_LOG_CRITICAL(_T("connecting..."));
+    boost::system::error_code error = boost::asio::error::host_not_found;
+    while (error && endpoint_iterator != end)
+    {
+      tcp::resolver::endpoint_type ep = *endpoint_iterator;
+      NSC_DEBUG_MSG_STD(_T("Attempting to connect to: ") + to_wstring(ep.address().to_string()) + _T(":") + to_wstring(ep.port()));
+      socket_.close();
+      socket_.connect(*endpoint_iterator++, error);
+    }
+    NSC_LOG_CRITICAL(_T("Connected..."));
+    if (error)
+      throw boost::system::system_error(error);
+  }
+  ~nrpe_socket() {
+    socket_.close();
+  }
+
+  void send(NRPEPacket &packet, boost::posix_time::seconds timeout) {
+    std::vector<char> buf(packet.getBufferLength());
+    write_with_timeout(socket_, socket_, boost::asio::buffer(packet.getBuffer(), packet.getBufferLength()), timeout);
+  }
+  NRPEPacket recv(const NRPEPacket &packet, boost::posix_time::seconds timeout) {
+    std::vector<char> buf(packet.getBufferLength());
+    read_with_timeout(socket_, socket_, boost::asio::buffer(buf), timeout);
+    return NRPEPacket(&buf[0], buf.size(), packet.getInternalBufferLength());
+  }
+};
+
+class nrpe_ssl_socket {
+
+private:
+  boost::asio::ssl::stream<boost::asio::ip::tcp::socket> socket_;
+public:
+  nrpe_ssl_socket(boost::asio::io_service &io_service, boost::asio::ssl::context &ctx, std::wstring host, int port) : socket_(io_service, ctx) {
+    NSC_LOG_CRITICAL(_T("Looking up..."));
+    tcp::resolver resolver(io_service);
+    //tcp::resolver::query query(to_string(host), to_string(port));
+    tcp::resolver::query query("www.medin.name", "80");
+    //tcp::resolver::query query("test_server", "80");
+
+    tcp::resolver::iterator endpoint_iterator = resolver.resolve(query);
+    tcp::resolver::iterator end;
+
+    boost::system::error_code error = boost::asio::error::host_not_found;
+    NSC_LOG_CRITICAL(_T("Connecting..."));
+    while (error && endpoint_iterator != end)
+    {
+      tcp::resolver::endpoint_type ep = *endpoint_iterator;
+      NSC_DEBUG_MSG_STD(_T("Attempting to connect to: ") + to_wstring(ep.address().to_string()) + _T(":") + to_wstring(ep.port()));
+      socket_.lowest_layer().close();
+      socket_.lowest_layer().connect(*endpoint_iterator++, error);
+    }
+    if (error)
+      throw boost::system::system_error(error);
+    NSC_LOG_CRITICAL(_T("Connected..."));
+
+    NSC_LOG_CRITICAL(_T("Handshaking..."));
+    //socket_.handshake(boost::asio::ssl::stream_base::client);
+    socket_.handshake(boost::asio::ssl::stream_base::client);
+    NSC_LOG_CRITICAL(_T("Handshook...") + strEx::itos(error.value()));
+
+  }
+
+  void send(NRPEPacket &packet, boost::posix_time::seconds timeout) {
+    NSC_LOG_CRITICAL(_T("Writing..."));
+    std::vector<char> buf(packet.getBufferLength());
+    write_with_timeout(socket_, socket_.lowest_layer(), boost::asio::buffer(packet.getBuffer(), packet.getBufferLength()), timeout);
+    NSC_LOG_CRITICAL(_T("Written..."));
+  }
+  NRPEPacket recv(const NRPEPacket &packet, boost::posix_time::seconds timeout) {
+    NSC_LOG_CRITICAL(_T("Reading..."));
+    std::vector<char> buf(packet.getBufferLength());
+    read_with_timeout(socket_, socket_.lowest_layer(), boost::asio::buffer(buf), timeout);
+    return NRPEPacket(&buf[0], buf.size(), packet.getInternalBufferLength());
+    NSC_LOG_CRITICAL(_T("Read..."));
+  }
+};
+
 NRPEPacket NRPEClient::send_nossl(std::wstring host, int port, int timeout, NRPEPacket packet)
 {
   boost::asio::io_service io_service;
-  tcp::resolver resolver(io_service);
-//  tcp::resolver::query query("127.0.0.1", boost::lexical_cast<std::string>(port));
-  tcp::resolver::query query("www.medin.name", "80");
-
-  tcp::resolver::iterator endpoint_iterator = resolver.resolve(query);
-  tcp::resolver::iterator end;
-
-  tcp::socket socket(io_service);
-  boost::system::error_code error = boost::asio::error::host_not_found;
-  while (error && endpoint_iterator != end)
-  {
-    tcp::resolver::endpoint_type ep = *endpoint_iterator;
-    NSC_DEBUG_MSG_STD(_T("Connectiing to: ") + boost::lexical_cast<std::wstring>(ep.address().to_string()) + _T(":") + boost::lexical_cast<std::wstring>(ep.port()));
-    socket.close();
-    socket.connect(*endpoint_iterator++, error);
-  }
-  if (error)
-    throw boost::system::system_error(error);
-
-  //for (;;)
-  {
-    std::vector<char> buf(packet.getBufferLength());
-    boost::system::error_code error;
-
-    size_t len = socket.write_some(boost::asio::buffer(packet.getBuffer(), packet.getBufferLength()), error);
-    NSC_DEBUG_MSG_STD(_T("Error: ") + strEx::itos(error.value()) + _T(" wrote: ") + strEx::itos(len));
-
-    read_with_timeout(socket, boost::asio::buffer(buf), boost::posix_time::seconds(5) );
-    //len = socket.read_some(boost::asio::buffer(buf), error);
-    NSC_DEBUG_MSG_STD(_T("Error: ") + strEx::itos(error.value()) + _T(" read: ") + strEx::itos(len));
-
-    if (error == boost::asio::error::eof)
-      ;//break; // Connection closed cleanly by peer.
-    else if (error)
-      throw boost::system::system_error(error); // Some other error.
-    packet.readFrom(&buf[0], buf.size());
-  }
-
-
-
+  nrpe_socket socket(io_service, host, port);
+  socket.send(packet, boost::posix_time::seconds(timeout));
+  return socket.recv(packet, boost::posix_time::seconds(timeout));
+}
+
+NRPEPacket NRPEClient::send_ssl(std::wstring host, int port, int timeout, NRPEPacket packet)
+{
+  boost::asio::io_service io_service;
+  boost::asio::ssl::context ctx(io_service, boost::asio::ssl::context::sslv23);
+  SSL_CTX_set_cipher_list(ctx.impl(), "ADH");
+  ctx.use_tmp_dh_file("d:\\nrpe_512.pem");
+  ctx.set_verify_mode(boost::asio::ssl::context::verify_none);
+  nrpe_ssl_socket socket(io_service, ctx, host, port);
+  socket.send(packet, boost::posix_time::seconds(timeout));
+  return socket.recv(packet, boost::posix_time::seconds(timeout));
+}
 /*
-  simpleSocket::Socket socket(true);
-  socket.connect(host, port);
-  socket.sendAll(packet.getBuffer(), packet.getBufferLength());
-  simpleSocket::DataBuffer buffer;
-  socket.readAll(buffer);
-  packet.readFrom(buffer.getBuffer(), buffer.getLength());
-  */
-  return packet;
-}
-
+NRPEPacket NRPEClient::send_nossl(std::wstring host, int port, int timeout, NRPEPacket packet)
+{
+  unsigned char dh512_p[] = {
+    0xCF, 0xFF, 0x65, 0xC2, 0xC8, 0xB4, 0xD2, 0x68, 0x8C, 0xC1, 0x80, 0xB1,
+    0x7B, 0xD6, 0xE8, 0xB3, 0x62, 0x59, 0x62, 0xED, 0xA7, 0x45, 0x6A, 0xF8,
+    0xE9, 0xD8, 0xBE, 0x3F, 0x38, 0x42, 0x5F, 0xB2, 0xA5, 0x36, 0x03, 0xD3,
+    0x06, 0x27, 0x81, 0xC8, 0x9B, 0x88, 0x50, 0x3B, 0x82, 0x3D, 0x31, 0x45,
+    0x2C, 0xB4, 0xC5, 0xA5, 0xBE, 0x6A, 0xE3, 0x2E, 0xA6, 0x86, 0xFD, 0x6A,
+    0x7E, 0x1E, 0x6A, 0x73,
+  };
+  unsigned char dh512_g[] = { 0x02, };
+
+  DH *dh_2 = DH_new();
+  dh_2->p = BN_bin2bn(dh512_p, sizeof(dh512_p), NULL);
+  dh_2->g = BN_bin2bn(dh512_g, sizeof(dh512_g), NULL);
+
+  FILE *outfile = fopen("d:\\nrpe_512.pem", "w");
+  PEM_write_DHparams(outfile, dh_2);
+  PEM_write_DHparams(stdout, dh_2);
+  fclose(outfile);
+
+  nrpe_socket socket(host, port);
+  socket.send(packet, boost::posix_time::seconds(timeout));
+  return socket.recv(packet, boost::posix_time::seconds(timeout));
+}
+*/
 
 

trunk/modules/NRPEClient/stdafx.h

@@ -36 +36 @@
 #include <NSCAPI.h>
 #include <NSCHelper.h>
+#include <nsc_module_wrapper.hpp>
 
 #include <boost/array.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/asio.hpp>
+#include <boost/optional.hpp>
 #include <boost/bind.hpp>
+#include <boost/asio/ssl.hpp>
 
 #ifdef MEMCHECK

trunk/modules/NRPEListener/stdafx.h

@@ -33 +33 @@
 #include <NSCAPI.h>
 #include <NSCHelper.h>
+#include <nsc_module_wrapper.hpp>
 
 #ifdef MEMCHECK

trunk/modules/NSCAAgent/stdafx.h

@@ -36 +36 @@
 #include <NSCAPI.h>
 #include <NSCHelper.h>
+#include <nsc_module_wrapper.hpp>
 #include <config.h>
 #include <utils.h>

trunk/modules/NSClientListener/stdafx.h

@@ -30 +30 @@
 #include <NSCAPI.h>
 #include <NSCHelper.h>
+#include <nsc_module_wrapper.hpp>
 
 #ifdef MEMCHECK

trunk/modules/SysTray/stdafx.h

@@ -27 +27 @@
 #include <string>
 #include <NSCHelper.h>
+#include <nsc_module_wrapper.hpp>
 #include <assert.h>
 

trunk/service/NSCPlugin.cpp

@@ -31 +31 @@
  */
 NSCPlugin::NSCPlugin(const std::wstring file)
-  : file_(file)
-  ,hModule_(NULL)
+  : module_(file)
   ,fLoadModule(NULL)
   ,fGetName(NULL)
@@ -50 +49 @@
 {
 }
-
+/*
 NSCPlugin::NSCPlugin(NSCPlugin &other)
-  :hModule_(NULL)
+  :module_()
   ,fLoadModule(NULL)
   ,fGetName(NULL)
@@ -80 +79 @@
   }
 }
-
+*/
 /**
  * Default d-tor
@@ -96 +95 @@
  */
 std::wstring NSCPlugin::getName() {
-  TCHAR *buffer = new TCHAR[1024];
+  wchar_t *buffer = new wchar_t[1024];
   if (!getName_(buffer, 1023)) {
     return _T("Could not get name");
@@ -105 +104 @@
 }
 std::wstring NSCPlugin::getDescription() {
-  TCHAR *buffer = new TCHAR[4096];
+  wchar_t *buffer = new wchar_t[4096];
   if (!getDescription_(buffer, 4095)) {
-    throw NSPluginException(file_, _T("Could not get description"));
+    throw NSPluginException(module_, _T("Could not get description"));
   }
   std::wstring ret = buffer;
@@ -121 +120 @@
  */
 void NSCPlugin::load_dll() {
-  if (isLoaded())
-    throw NSPluginException(file_, _T("Module already loaded"));
-  hModule_ = LoadLibrary(file_.c_str());
-  if (!hModule_)
-    throw NSPluginException(file_, _T("Could not load library: ") + error::lookup::last_error() + _T(" for file: ") + file_);
+  if (module_.is_loaded())
+    throw NSPluginException(module_, _T("Module already loaded"));
+  try {
+    module_.load_library();
+  } catch (dll::dll_exception &e) {
+    throw NSPluginException(module_, e.what());
+  }
   loadRemoteProcs_();
   bLoaded_ = true;
@@ -132 +133 @@
 bool NSCPlugin::load_plugin(NSCAPI::moduleLoadMode mode) {
   if (!fLoadModule)
-    throw NSPluginException(file_, _T("Critical error (fLoadModule)"));
+    throw NSPluginException(module_, _T("Critical error (fLoadModule)"));
   return fLoadModule(mode);
 }
@@ -156 +157 @@
 bool NSCPlugin::getVersion(int *major, int *minor, int *revision) {
   if (!isLoaded())
-    throw NSPluginException(file_, _T("Library is not loaded"));
+    throw NSPluginException(module_, _T("Library is not loaded"));
   if (!fGetVersion)
-    throw NSPluginException(file_, _T("Critical error (fGetVersion)"));
+    throw NSPluginException(module_, _T("Critical error (fGetVersion)"));
   try {
     return fGetVersion(major, minor, revision)?true:false;
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in getVersion."));
+    throw NSPluginException(module_, _T("Unhandled exception in getVersion."));
   }
 }
@@ -172 +173 @@
 bool NSCPlugin::hasCommandHandler() {
   if (!isLoaded())
-    throw NSPluginException(file_, _T("Module not loaded"));
+    throw NSPluginException(module_, _T("Module not loaded"));
   try {
     if (fHasCommandHandler())
@@ -178 +179 @@
     return false;
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in hasCommandHandler."));
+    throw NSPluginException(module_, _T("Unhandled exception in hasCommandHandler."));
   }
 }
@@ -188 +189 @@
 bool NSCPlugin::hasMessageHandler() {
   if (!isLoaded())
-    throw NSPluginException(file_, _T("Module not loaded"));
+    throw NSPluginException(module_, _T("Module not loaded"));
   try {
     if (fHasMessageHandler()) {
@@ -196 +197 @@
     return false;
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in hasMessageHandler."));
+    throw NSPluginException(module_, _T("Unhandled exception in hasMessageHandler."));
   }
 }
@@ -214 +215 @@
  * @throws NSPluginException if the module is not loaded.
  */
-NSCAPI::nagiosReturn NSCPlugin::handleCommand(const TCHAR* command, const unsigned int argLen, TCHAR **arguments, TCHAR* returnMessageBuffer, unsigned int returnMessageBufferLen, TCHAR* returnPerfBuffer, unsigned int returnPerfBufferLen) {
-  if (!isLoaded())
-    throw NSPluginException(file_, _T("Library is not loaded"));
+NSCAPI::nagiosReturn NSCPlugin::handleCommand(const wchar_t* command, const unsigned int argLen, wchar_t **arguments, wchar_t* returnMessageBuffer, unsigned int returnMessageBufferLen, TCHAR* returnPerfBuffer, unsigned int returnPerfBufferLen) {
+  if (!isLoaded())
+    throw NSPluginException(module_, _T("Library is not loaded"));
   try {
     return fHandleCommand(command, argLen, arguments, returnMessageBuffer, returnMessageBufferLen, returnPerfBuffer, returnPerfBufferLen);
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in handleCommand."));
+    throw NSPluginException(module_, _T("Unhandled exception in handleCommand."));
   }
 }
@@ -232 +233 @@
  * @throws NSPluginException if the module is not loaded.
  */
-void NSCPlugin::handleMessage(int msgType, const TCHAR* file, const int line, const TCHAR *message) {
+void NSCPlugin::handleMessage(int msgType, const wchar_t* file, const int line, const wchar_t *message) {
   if (!fHandleMessage)
-    throw NSPluginException(file_, _T("Library is not loaded"));
+    throw NSPluginException(module_, _T("Library is not loaded"));
   try {
     fHandleMessage(msgType, file, line, message);
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in handleMessage."));
+    throw NSPluginException(module_, _T("Unhandled exception in handleMessage."));
   }
 }
@@ -247 +248 @@
 void NSCPlugin::unload() {
   if (!isLoaded())
-    throw NSPluginException(file_, _T("Library is not loaded"));
+    throw NSPluginException(module_, _T("Library is not loaded"));
+  bLoaded_ = false;
   if (!fUnLoadModule)
-    throw NSPluginException(file_, _T("Critical error (fUnLoadModule)"));
+    throw NSPluginException(module_, _T("Critical error (fUnLoadModule)"));
   try {
     fUnLoadModule();
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in handleMessage."));
-  }
-  FreeLibrary(hModule_);
-  hModule_ = NULL;
-  bLoaded_ = false;
-}
-bool NSCPlugin::getName_(TCHAR* buf, unsigned int buflen) {
+    throw NSPluginException(module_, _T("Unhandled exception in handleMessage."));
+  }
+  module_.unload_library();
+}
+bool NSCPlugin::getName_(wchar_t* buf, unsigned int buflen) {
   if (fGetName == NULL)
-    return false;//throw NSPluginException(file_, _T("Critical error (fGetName)"));
+    return false;//throw NSPluginException(module_, _T("Critical error (fGetName)"));
   try {
     return fGetName(buf, buflen)?true:false;
   } catch (...) {
-    return false; //throw NSPluginException(file_, _T("Unhandled exception in getName."));
-  }
-}
-bool NSCPlugin::getDescription_(TCHAR* buf, unsigned int buflen) {
+    return false; //throw NSPluginException(module_, _T("Unhandled exception in getName."));
+  }
+}
+bool NSCPlugin::getDescription_(wchar_t* buf, unsigned int buflen) {
   if (fGetDescription == NULL)
-    throw NSPluginException(file_, _T("Critical error (fGetDescription)"));
+    throw NSPluginException(module_, _T("Critical error (fGetDescription)"));
   try {
     return fGetDescription(buf, buflen)?true:false;
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in getDescription."));
+    throw NSPluginException(module_, _T("Unhandled exception in getDescription."));
   }
 }
@@ -280 +280 @@
 void NSCPlugin::showTray() {
   if (fShowTray == NULL)
-    throw NSPluginException(file_, _T("Critical error (ShowTray)"));
+    throw NSPluginException(module_, _T("Critical error (ShowTray)"));
   try {
     fShowTray();
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in ShowTray."));
+    throw NSPluginException(module_, _T("Unhandled exception in ShowTray."));
   }
 }
 void NSCPlugin::hideTray() {
   if (fHideTray == NULL)
-    throw NSPluginException(file_, _T("Critical error (HideTray)"));
+    throw NSPluginException(module_, _T("Critical error (HideTray)"));
   try {
     fHideTray();
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in HideTray."));
+    throw NSPluginException(module_, _T("Unhandled exception in HideTray."));
   }
 }
@@ -305 +305 @@
 void NSCPlugin::loadRemoteProcs_(void) {
 
-  fLoadModule = (lpLoadModule)GetProcAddress(hModule_, "NSLoadModule");
+  fLoadModule = (lpLoadModule)module_.load_proc("NSLoadModule");
   if (!fLoadModule)
-    throw NSPluginException(file_, _T("Could not load NSLoadModule"));
-
-  fModuleHelperInit = (lpModuleHelperInit)GetProcAddress(hModule_, "NSModuleHelperInit");
+    throw NSPluginException(module_, _T("Could not load NSLoadModule"));
+
+  fModuleHelperInit = (lpModuleHelperInit)module_.load_proc("NSModuleHelperInit");
   if (!fModuleHelperInit)
-    throw NSPluginException(file_, _T("Could not load NSModuleHelperInit"));
+    throw NSPluginException(module_, _T("Could not load NSModuleHelperInit"));
 
   try {
     fModuleHelperInit(NSAPILoader);
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in getDescription."));
+    throw NSPluginException(module_, _T("Unhandled exception in getDescription."));
   }
   
-  fGetName = (lpGetName)GetProcAddress(hModule_, "NSGetModuleName");
+  fGetName = (lpGetName)module_.load_proc("NSGetModuleName");
   if (!fGetName)
-    throw NSPluginException(file_, _T("Could not load NSGetModuleName"));
-
-  fGetVersion = (lpGetVersion)GetProcAddress(hModule_, "NSGetModuleVersion");
+    throw NSPluginException(module_, _T("Could not load NSGetModuleName"));
+
+  fGetVersion = (lpGetVersion)module_.load_proc("NSGetModuleVersion");
   if (!fGetVersion)
-    throw NSPluginException(file_, _T("Could not load NSGetModuleVersion"));
-
-  fGetDescription = (lpGetDescription)GetProcAddress(hModule_, "NSGetModuleDescription");
+    throw NSPluginException(module_, _T("Could not load NSGetModuleVersion"));
+
+  fGetDescription = (lpGetDescription)module_.load_proc("NSGetModuleDescription");
   if (!fGetDescription)
-    throw NSPluginException(file_, _T("Could not load NSGetModuleDescription"));
-
-  fHasCommandHandler = (lpHasCommandHandler)GetProcAddress(hModule_, "NSHasCommandHandler");
+    throw NSPluginException(module_, _T("Could not load NSGetModuleDescription"));
+
+  fHasCommandHandler = (lpHasCommandHandler)module_.load_proc("NSHasCommandHandler");
   if (!fHasCommandHandler)
-    throw NSPluginException(file_, _T("Could not load NSHasCommandHandler"));
-
-  fHasMessageHandler = (lpHasMessageHandler)GetProcAddress(hModule_, "NSHasMessageHandler");
+    throw NSPluginException(module_, _T("Could not load NSHasCommandHandler"));
+
+  fHasMessageHandler = (lpHasMessageHandler)module_.load_proc("NSHasMessageHandler");
   if (!fHasMessageHandler)
-    throw NSPluginException(file_, _T("Could not load NSHasMessageHandler"));
-
-  fHandleCommand = (lpHandleCommand)GetProcAddress(hModule_, "NSHandleCommand");
+    throw NSPluginException(module_, _T("Could not load NSHasMessageHandler"));
+
+  fHandleCommand = (lpHandleCommand)module_.load_proc("NSHandleCommand");
   if (!fHandleCommand)
-    throw NSPluginException(file_, _T("Could not load NSHandleCommand"));
-
-  fHandleMessage = (lpHandleMessage)GetProcAddress(hModule_, "NSHandleMessage");
+    throw NSPluginException(module_, _T("Could not load NSHandleCommand"));
+
+  fHandleMessage = (lpHandleMessage)module_.load_proc("NSHandleMessage");
   if (!fHandleMessage)
-    throw NSPluginException(file_, _T("Could not load NSHandleMessage"));
-
-  fUnLoadModule = (lpUnLoadModule)GetProcAddress(hModule_, "NSUnloadModule");
+    throw NSPluginException(module_, _T("Could not load NSHandleMessage"));
+
+  fUnLoadModule = (lpUnLoadModule)module_.load_proc("NSUnloadModule");
   if (!fUnLoadModule)
-    throw NSPluginException(file_, _T("Could not load NSUnloadModule"));
-
-  fGetConfigurationMeta = (lpGetConfigurationMeta)GetProcAddress(hModule_, "NSGetConfigurationMeta");
-  fCommandLineExec = (lpCommandLineExec)GetProcAddress(hModule_, "NSCommandLineExec");
-
-  fShowTray = (lpShowTray)GetProcAddress(hModule_, "ShowIcon");
-  fHideTray = (lpHideTray)GetProcAddress(hModule_, "HideIcon");
+    throw NSPluginException(module_, _T("Could not load NSUnloadModule"));
+
+  fGetConfigurationMeta = (lpGetConfigurationMeta)module_.load_proc("NSGetConfigurationMeta");
+  fCommandLineExec = (lpCommandLineExec)module_.load_proc("NSCommandLineExec");
+
+  fShowTray = (lpShowTray)module_.load_proc("ShowIcon");
+  fHideTray = (lpHideTray)module_.load_proc("HideIcon");
 
 }
@@ -362 +362 @@
 std::wstring NSCPlugin::getCongifurationMeta() 
 {
-  TCHAR *buffer = new TCHAR[4097];
+  wchar_t *buffer = new wchar_t[4097];
   if (!getConfigurationMeta_(buffer, 4096)) {
-    throw NSPluginException(file_, _T("Could not get metadata"));
+    throw NSPluginException(module_, _T("Could not get metadata"));
   }
   std::wstring ret = buffer;
@@ -370 +370 @@
   return ret;
 }
-bool NSCPlugin::getConfigurationMeta_(TCHAR* buf, unsigned int buflen) {
+bool NSCPlugin::getConfigurationMeta_(wchar_t* buf, unsigned int buflen) {
   if (fGetConfigurationMeta == NULL)
-    throw NSPluginException(file_, _T("Critical error (getCongifurationMeta)"));
+    throw NSPluginException(module_, _T("Critical error (getCongifurationMeta)"));
   try {
     return fGetConfigurationMeta(buflen, buf)?true:false;
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in getConfigurationMeta."));
-  }
-}
-
-int NSCPlugin::commandLineExec(const TCHAR* command, const unsigned int argLen, TCHAR **arguments) {
+    throw NSPluginException(module_, _T("Unhandled exception in getConfigurationMeta."));
+  }
+}
+
+int NSCPlugin::commandLineExec(const wchar_t* command, const unsigned int argLen, wchar_t **arguments) {
   if (fCommandLineExec== NULL)
-    throw NSPluginException(file_, _T("Module does not support CommandLineExec"));
+    throw NSPluginException(module_, _T("Module does not support CommandLineExec"));
   try {
     return fCommandLineExec(command, argLen, arguments);
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in commandLineExec."));
-  }
-}
+    throw NSPluginException(module_, _T("Unhandled exception in commandLineExec."));
+  }
+}

trunk/service/NSCPlugin.h

@@ -22 +22 @@
 
 #include <NSCAPI.h>
-#include <NSCHelper.h>
+//#include <NSCHelper.h>
 #include <sstream>
+#include <dll/dll.hpp>
 
 /**
@@ -58 +59 @@
    * @param error An error message (human readable format)
    */
-  NSPluginException(std::wstring file, std::wstring error) : error_(error) {
-    file_ = getModule(file);
+  NSPluginException(dll::dll &module, std::wstring error) : error_(error) {
+    file_ = getModule(module.get_file());
   }
   std::wstring getModule(std::wstring file) {
@@ -105 +106 @@
 private:
   bool bLoaded_;      // Status of plug in
-  HMODULE hModule_;   // module handle to the DLL (once it is loaded)
-  std::wstring file_;   // Name of the DLL file
+  dll::dll module_;
   bool broken_;
 
-  typedef INT (*lpModuleHelperInit)(NSCModuleHelper::lpNSAPILoader f);
-  typedef INT (*lpLoadModule)(int);
-  typedef INT (*lpGetName)(TCHAR*,unsigned int);
-  typedef INT (*lpGetDescription)(TCHAR*,unsigned int);
-  typedef INT (*lpGetVersion)(int*,int*,int*);
-  typedef INT (*lpHasCommandHandler)();
-  typedef INT (*lpHasMessageHandler)();
-  typedef NSCAPI::nagiosReturn (*lpHandleCommand)(const TCHAR*,const unsigned int, TCHAR**,TCHAR*,unsigned int,TCHAR *,unsigned int);
-  typedef INT (*lpCommandLineExec)(const TCHAR*,const unsigned int,TCHAR**);
-  typedef INT (*lpHandleMessage)(int,const TCHAR*,const int,const TCHAR*);
-  typedef INT (*lpUnLoadModule)();
-  typedef INT (*lpGetConfigurationMeta)(int, TCHAR*);
+  typedef int (*lpModuleHelperInit)(NSCModuleHelper::lpNSAPILoader f);
+  typedef int (*lpLoadModule)(int);
+  typedef int (*lpGetName)(wchar_t*,unsigned int);
+  typedef int (*lpGetDescription)(wchar_t*,unsigned int);
+  typedef int (*lpGetVersion)(int*,int*,int*);
+  typedef int (*lpHasCommandHandler)();
+  typedef int (*lpHasMessageHandler)();
+  typedef NSCAPI::nagiosReturn (*lpHandleCommand)(const wchar_t*,const unsigned int, wchar_t**,wchar_t*,unsigned int,wchar_t *,unsigned int);
+  typedef int (*lpCommandLineExec)(const wchar_t*,const unsigned int,wchar_t**);
+  typedef int (*lpHandleMessage)(int,const wchar_t*,const int,const wchar_t*);
+  typedef int (*lpUnLoadModule)();
+  typedef int (*lpGetConfigurationMeta)(int, wchar_t*);
   typedef void (*lpShowTray)();
   typedef void (*lpHideTray)();
@@ -154 +154 @@
   bool hasCommandHandler(void);
   bool hasMessageHandler(void);
-  NSCAPI::nagiosReturn handleCommand(const TCHAR *command, const unsigned int argLen, TCHAR **arguments, TCHAR* returnMessageBuffer, unsigned int returnMessageBufferLen, TCHAR* returnPerfBuffer, unsigned int returnPerfBufferLen);
-  void handleMessage(int msgType, const TCHAR* file, const int line, const TCHAR *message);
+  NSCAPI::nagiosReturn handleCommand(const wchar_t *command, const unsigned int argLen, wchar_t **arguments, wchar_t* returnMessageBuffer, unsigned int returnMessageBufferLen, TCHAR* returnPerfBuffer, unsigned int returnPerfBufferLen);
+  void handleMessage(int msgType, const wchar_t* file, const int line, const wchar_t *message);
   void unload(void);
   std::wstring getCongifurationMeta();
-  int commandLineExec(const TCHAR* command, const unsigned int argLen, TCHAR **arguments);
+  int commandLineExec(const wchar_t* command, const unsigned int argLen, wchar_t **arguments);
   void showTray();
   void hideTray();
 
   std::wstring getFilename() {
-    if (file_.empty())
+    std::wstring file = module_.get_file();
+    if (file.empty())
       return _T("");
-    std::wstring::size_type pos = file_.find_last_of(_T("\\"));
-    if (pos != std::wstring::npos && ++pos < file_.length()) {
-      return file_.substr(pos);
+    std::wstring::size_type pos = file.find_last_of(_T("\\"));
+    if (pos != std::wstring::npos && ++pos < file.length()) {
+      return file.substr(pos);
     }
-    return file_;
+    return file;
   }
   std::wstring getModule() {
-    if (file_.empty())
-      return _T("");
-    std::wstring ret = file_;
-    std::wstring::size_type pos = ret.find_last_of(_T("\\"));
-    if (pos != std::wstring::npos && ++pos < ret.length()) {
-      ret = ret.substr(pos);
+    std::wstring file = getFilename();
+    std::wstring::size_type pos = file.find_last_of(_T("."));
+    if (pos != std::wstring::npos) {
+      file = file.substr(0, pos);
     }
-    pos = ret.find_last_of(_T("."));
-    if (pos != std::wstring::npos) {
-      ret = ret.substr(0, pos);
-    }
-    return ret;
+    return file;
   }
   bool getLastIsMsgPlugin() {
@@ -194 +189 @@
 private:
   bool lastIsMsgPlugin_;
-  bool getName_(TCHAR* buf, unsigned int buflen);
-  bool getDescription_(TCHAR* buf, unsigned int buflen);
+  bool getName_(wchar_t* buf, unsigned int buflen);
+  bool getDescription_(wchar_t* buf, unsigned int buflen);
   void loadRemoteProcs_(void);
-  bool getConfigurationMeta_(TCHAR* buf, unsigned int buflen);
+  bool getConfigurationMeta_(wchar_t* buf, unsigned int buflen);
 };
 

trunk/service/NSClient++-2005.vcproj

@@ -2093 +2093 @@
       </File>
       <File
-        RelativePath="..\include\Socket.cpp"
-        >
-        <FileConfiguration
-          Name="Release|Win32"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="0"
-            PrecompiledHeaderThrough=" "
-            PrecompiledHeaderFile=" "
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="Release|x64"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="0"
-            PrecompiledHeaderThrough=" "
-            PrecompiledHeaderFile=" "
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="Debug|Win32"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="0"
-            PrecompiledHeaderThrough=" "
-            PrecompiledHeaderFile=" "
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="Debug|x64"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="0"
-            PrecompiledHeaderThrough=" "
-            PrecompiledHeaderFile=" "
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="Distribution|Win32"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="0"
-            PrecompiledHeaderThrough=" "
-            PrecompiledHeaderFile=" "
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="Distribution|x64"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="0"
-            PrecompiledHeaderThrough=" "
-            PrecompiledHeaderFile=" "
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="Nightly|Win32"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="0"
-            PrecompiledHeaderThrough=" "
-            PrecompiledHeaderFile=" "
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="Nightly|x64"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="0"
-            PrecompiledHeaderThrough=" "
-            PrecompiledHeaderFile=" "
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="Debug-MemCheck|Win32"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="0"
-            PrecompiledHeaderThrough=" "
-            PrecompiledHeaderFile=" "
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="Debug-MemCheck|x64"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="0"
-            PrecompiledHeaderThrough=" "
-            PrecompiledHeaderFile=" "
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="OP5|Win32"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="0"
-            PrecompiledHeaderThrough=" "
-            PrecompiledHeaderFile=" "
-          />
-        </FileConfiguration>
-        <FileConfiguration
-          Name="OP5|x64"
-          >
-          <Tool
-            Name="VCCLCompilerTool"
-            UsePrecompiledHeader="0"
-            PrecompiledHeaderThrough=" "
-            PrecompiledHeaderFile=" "
-          />
-        </FileConfiguration>
-      </File>
-      <File
         RelativePath="StdAfx.cpp"
         >
@@ -2395 +2271 @@
       </File>
       <File
+        RelativePath="..\include\dll\dll.hpp"
+        >
+      </File>
+      <File
         RelativePath=".\include\error.hpp"
         >
@@ -2403 +2283 @@
       </File>
       <File
+        RelativePath="..\include\dll\impl_unix.hpp"
+        >
+      </File>
+      <File
+        RelativePath="..\include\dll\impl_w32.hpp"
+        >
+      </File>
+      <File
         RelativePath=".\include\Mutex.h"
         >
@@ -2411 +2299 @@
       </File>
       <File
-        RelativePath=".\include\NSCAPI.h"
+        RelativePath="..\include\NSCAPI.h"
         >
       </File>
@@ -2431 +2319 @@
       </File>
       <File
-        RelativePath=".\include\NTService.h"
+        RelativePath="..\include\NTService.h"
         >
       </File>
@@ -2487 +2375 @@
       </File>
       <File
-        RelativePath=".\include\Socket.h"
-        >
-      </File>
-      <File
         RelativePath="StdAfx.h"
         >
@@ -2504 +2388 @@
       <File
         RelativePath=".\tray_manager.hpp"
+        >
+      </File>
+      <File
+        RelativePath="..\include\unicode_char.hpp"
         >
       </File>

trunk/service/NSClient++.cpp

@@ -13 +13 @@
 //
 //////////////////////////////////////////////////////////////////////////
-#include "stdafx.h"
-#include <winsvc.h>
+#include "StdAfx.h"
 #include "NSClient++.h"
 #include <settings/Settings.h>
 #include <charEx.h>
-#include <Socket.h>
+//#include <Socket.h>
 #include <config.h>
 #include <msvc_wrappers.h>
+#ifdef WIN32
 #include <Userenv.h>
-#include <remote_processes.hpp>
 #include <Lmcons.h>
 //#ifdef DEBUG
 #include <crtdbg.h>
 //#endif
-#include <Userenv.h>
+#endif
 #include <remote_processes.hpp>
-#include <Lmcons.h>
+//#include <winsvc.h>
+//#include <Userenv.h>
+//#include <Lmcons.h>
+#include <remote_processes.hpp>
 #include "core_api.h"
 #include "settings_manager_impl.h"
 #include <settings/macros.h>
+#include <NSCHelper.h>
 
 NSClient mainClient(SZSERVICENAME); // Global core instance.
@@ -209 +212 @@
   int nRetCode = 0;
   if ( (argc > 1) && ((*argv[1] == '-') || (*argv[1] == '/')) ) {
-    if ( _wcsicmp( _T("install"), argv[1]+1 ) == 0 ) {
+    if (false) {
+#ifdef WIN32
+    } if ( _wcsicmp( _T("install"), argv[1]+1 ) == 0 ) {
       bool bGui = false;
       bool bStart = false;
@@ -288 +293 @@
       LOG_MESSAGE(_T("Service uninstalled!"));
       return 0;
+    } else if ( _wcsicmp( _T("start"), argv[1]+1 ) == 0 ) {
+      g_bConsoleLog = true;
+      bool bGui = false;
+      std::wstring service_name;
+      for (int i=2;i<argc;i++) {
+        if (_wcsicmp( _T("gui"), argv[i]) == 0) {
+          bGui = true;
+        } else {
+          service_name = argv[i];
+        }
+      }
+      if (service_name.empty())
+        service_name = SZSERVICENAME;
+      try {
+        serviceControll::Start(service_name.c_str());
+      } catch (const serviceControll::SCException& e) {
+        if (bGui)
+          display(_T("Service failed to start"), e.error_);
+        LOG_MESSAGE_STD(_T("Service failed to start: ") + e.error_);
+        return -1;
+      }
+    } else if ( _wcsicmp( _T("stop"), argv[1]+1 ) == 0 ) {
+      g_bConsoleLog = true;
+      bool bGui = false;
+      std::wstring service_name;
+      for (int i=2;i<argc;i++) {
+        if (_wcsicmp( _T("gui"), argv[i]) == 0) {
+          bGui = true;
+        } else {
+          service_name = argv[i];
+        }
+      }
+      if (service_name.empty())
+        service_name = SZSERVICENAME;
+      try {
+        serviceControll::Stop(service_name.c_str());
+      } catch (const serviceControll::SCException& e) {
+        if (bGui)
+          display(_T("Service failed to stop"), e.error_);
+        LOG_MESSAGE_STD(_T("Service failed to stop: ") + e.error_);
+        return -1;
+      }
+    } else if ( _wcsicmp( _T("svc"), argv[1]+1 ) == 0 ) {
+      g_bConsoleLog = true;
+      try {
+        std::wstring exe = serviceControll::get_exe_path(SZSERVICENAME);
+        LOG_MESSAGE_STD(_T("The Service uses: ") + exe);
+      } catch (const serviceControll::SCException& e) {
+        LOG_ERROR_STD(_T("Failed to find service: ") + e.error_);
+      }
+#endif
     } else if ( _wcsicmp( _T("encrypt"), argv[1]+1 ) == 0 ) {
       g_bConsoleLog = true;
@@ -304 +360 @@
       settings_manager::destroy_settings();
       return 0;
-    } else if ( _wcsicmp( _T("start"), argv[1]+1 ) == 0 ) {
-      g_bConsoleLog = true;
-      bool bGui = false;
-      std::wstring service_name;
-      for (int i=2;i<argc;i++) {
-        if (_wcsicmp( _T("gui"), argv[i]) == 0) {
-          bGui = true;
-        } else {
-          service_name = argv[i];
-        }
-      }
-      if (service_name.empty())
-        service_name = SZSERVICENAME;
-      try {
-        serviceControll::Start(service_name.c_str());
-      } catch (const serviceControll::SCException& e) {
-        if (bGui)
-          display(_T("Service failed to start"), e.error_);
-        LOG_MESSAGE_STD(_T("Service failed to start: ") + e.error_);
-        return -1;
-      }
-    } else if ( _wcsicmp( _T("stop"), argv[1]+1 ) == 0 ) {
-      g_bConsoleLog = true;
-      bool bGui = false;
-      std::wstring service_name;
-      for (int i=2;i<argc;i++) {
-        if (_wcsicmp( _T("gui"), argv[i]) == 0) {
-          bGui = true;
-        } else {
-          service_name = argv[i];
-        }
-      }
-      if (service_name.empty())
-        service_name = SZSERVICENAME;
-      try {
-        serviceControll::Stop(service_name.c_str());
-      } catch (const serviceControll::SCException& e) {
-        if (bGui)
-          display(_T("Service failed to stop"), e.error_);
-        LOG_MESSAGE_STD(_T("Service failed to stop: ") + e.error_);
-        return -1;
-      }
     } else if ( _wcsicmp( _T("about"), argv[1]+1 ) == 0 ) {
       g_bConsoleLog = true;
@@ -391 +405 @@
     } else if ( _wcsicmp( _T("noboot"), argv[1]+1 ) == 0 ) {
       g_bConsoleLog = true;
-      mainClient.enableDebug(true);
-      mainClient.initCore(true);
-      std::wstring command, args, msg, perf;
-      if (argc > 2)
-        command = argv[2];
-      for (int i=3;i<argc;i++) {
-        if (i!=3) args += _T(" ");
-        args += argv[i];
-      }
-      nRetCode = mainClient.inject(command, args, L' ', true, msg, perf);
-      std::wcout << msg << _T("|") << perf << std::endl;
+      mainClient.enableDebug(false);
+      mainClient.initCore(false);
+      if (argc>=4)
+        nRetCode = mainClient.commandLineExec(argv[2], argv[3], argc-4, &argv[4]);
+      else
+        nRetCode = mainClient.commandLineExec(argv[2], argv[3], 0, NULL);
       mainClient.exitCore(true);
       return nRetCode;
@@ -420 +429 @@
       mainClient.exitCore(true);
       return nRetCode;
-      g_bConsoleLog = true;
-      mainClient.enableDebug(false);
-      mainClient.initCore(false);
-      int nRetCode = -1;
-      if (argc>=4)
-        nRetCode = mainClient.commandLineExec(argv[2], argv[3], argc-4, &argv[4]);
-      else if (argc>=3)
-        nRetCode = mainClient.commandLineExec(argv[2], argv[3], 0, NULL);
-      mainClient.exitCore(false);
-      return nRetCode;
-    } else if ( _wcsicmp( _T("svc"), argv[1]+1 ) == 0 ) {
-      g_bConsoleLog = true;
-      try {
-        std::wstring exe = serviceControll::get_exe_path(SZSERVICENAME);
-        LOG_MESSAGE_STD(_T("The Service uses: ") + exe);
-      } catch (const serviceControll::SCException& e) {
-        LOG_ERROR_STD(_T("Failed to find service: ") + e.error_);
-      }
     } else if ( _wcsicmp( _T("test"), argv[1]+1 ) == 0 ) {
       bool server = false;
@@ -445 +436 @@
       std::wcout << "Launching test mode - " << (server?_T("server mode"):_T("client mode")) << std::endl;
       LOG_MESSAGE_STD(_T("Booting: " SZSERVICEDISPLAYNAME ));
+#ifdef WIN32
       try {
         if (serviceControll::isStarted(SZSERVICENAME)) {
@@ -452 +444 @@
         e;// Empty by design
       }
+#endif
       g_bConsoleLog = true;
       mainClient.enableDebug(true);
@@ -788 +781 @@
     }
   }
-
+/*
   try {
     simpleSocket::WSAStartup();
@@ -798 +791 @@
     return false;
   }
-
+*/
   try {
     com_helper_.initialize();
@@ -921 +914 @@
     LOG_ERROR_STD(_T("Unknown exception uniniating COM..."));
   }
+  /*
   LOG_DEBUG_STD(_T("Stopping: Socket Helpers"));
   try {
@@ -929 +923 @@
     LOG_ERROR_STD(_T("Unknown exception uniniating socket..."));
   }
+  */
   LOG_DEBUG_STD(_T("Stopping: Settings instance"));
   settings_manager::destroy_settings();
@@ -979 +974 @@
 void WINAPI NSClientT::service_main_dispatch(DWORD dwArgc, LPTSTR *lpszArgv) {
   try {
-    mainClient.service_main(dwArgc, lpszArgv);
+    //WTF!!! mainClient.service_main(dwArgc, lpszArgv);
   } catch (service_helper::service_exception e) {
     LOG_ERROR_STD(_T("Unknown service error: ") + e.what());
@@ -1045 +1040 @@
     return plugin->commandLineExec(command, argLen, args);
   } catch (NSPluginException e) {
-    LOG_MESSAGE_STD(_T("Failed to load (") + e.file_ + _T("): ") + e.error_);
+    LOG_MESSAGE_STD(_T("Module (") + e.file_ + _T(") was not found: ") + e.error_);
   }
   try {
@@ -1405 +1400 @@
  */
 void NSClientT::reportMessage(int msgType, const TCHAR* file, const int line, std::wstring message) {
-  strEx::replace(message, _T("\n"), _T(" "));
-  strEx::replace(message, _T("\r"), _T(" "));
-  if ((msgType == NSCAPI::debug)&&(!logDebug())) {
-    return;
-  }
-  if (shared_server_.get() != NULL && shared_server_->hasClients()) {
-    try {
-      shared_server_->sendLogMessageToClients(msgType, file, line, message);
-    } catch (nsclient_session::session_exception e) {
-      log_broken_message(_T("Failed to send message to clients: ") + e.what());
-    }
-  }
-  std::wstring file_stl = file;
-  std::wstring::size_type pos = file_stl.find_last_of(_T("\\"));
-  if (pos != std::wstring::npos)
-    file_stl = file_stl.substr(pos);
-  {
-    ReadLock readLock(&m_mutexRW, true, 5000);
-    if (!readLock.IsLocked()) {
-      log_broken_message(_T("Message was lost as the (mutexRW) core was locked: ") + message);
+  try {
+    strEx::replace(message, _T("\n"), _T(" "));
+    strEx::replace(message, _T("\r"), _T(" "));
+    if ((msgType == NSCAPI::debug)&&(!logDebug())) {
       return;
     }
-    MutexLock lock(messageMutex);
-    if (!lock.hasMutex()) {
-      log_broken_message(_T("Message was lost as the core was locked: ") + message);
-      return;
-    }
-    if (g_bConsoleLog) {
-      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 << " " << strEx::wstring_to_string(file_stl) << "(" << line << ") " << strEx::wstring_to_string(message) << std::endl;
-    }
-    if (!plugins_loaded_) {
-      OutputDebugString(message.c_str());
-      log_cache_.push_back(cached_log_entry(msgType, file, line, message));
-    } else {
-      if (log_cache_.size() > 0) {
-        for (log_cache_type::const_iterator cit=log_cache_.begin();cit!=log_cache_.end();++cit) {
-          for (pluginList::size_type i = 0; i< messageHandlers_.size(); i++) {
-            try {
-              messageHandlers_[i]->handleMessage((*cit).msgType, (_T("CACHE") + (*cit).file).c_str(), (*cit).line, (*cit).message.c_str());
-            } catch(const NSPluginException& e) {
-              log_broken_message(_T("Caught: ") + e.error_ + _T(" when trying to log a message..."));
-              return;
-            } catch(...) {
-              log_broken_message(_T("Caught: Unknown Exception when trying to log a message..."));
-              return;
+    if (shared_server_.get() != NULL && shared_server_->hasClients()) {
+      try {
+        shared_server_->sendLogMessageToClients(msgType, file, line, message);
+      } catch (nsclient_session::session_exception e) {
+        log_broken_message(_T("Failed to send message to clients: ") + e.what());
+      }
+    }
+    std::wstring file_stl = file;
+    std::wstring::size_type pos = file_stl.find_last_of(_T("\\"));
+    if (pos != std::wstring::npos)
+      file_stl = file_stl.substr(pos);
+    {
+      ReadLock readLock(&m_mutexRW, true, 5000);
+      if (!readLock.IsLocked()) {
+        log_broken_message(_T("Message was lost as the (mutexRW) core was locked: ") + message);
+        return;
+      }
+      boost::unique_lock<boost::timed_mutex> lock(messageMutex, boost::get_system_time() + boost::posix_time::milliseconds(5000));
+      if (!lock.owns_lock()) {
+        log_broken_message(_T("Message was lost as the core was locked: ") + message);
+        return;
+      }
+      if (g_bConsoleLog) {
+        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 << " " << strEx::wstring_to_string(file_stl) << "(" << line << ") " << strEx::wstring_to_string(message) << std::endl;
+      }
+      if (!plugins_loaded_) {
+        log_broken_message(message);
+        cached_log_entry entry(msgType, file, line, message);
+        log_cache_.push_back(entry);
+      } else {
+        if (log_cache_.size() > 0) {
+          for (log_cache_type::const_iterator cit=log_cache_.begin();cit!=log_cache_.end();++cit) {
+            for (pluginList::size_type i = 0; i< messageHandlers_.size(); i++) {
+              try {
+                messageHandlers_[i]->handleMessage((*cit).msgType, (_T("CACHE") + (*cit).file).c_str(), (*cit).line, (*cit).message.c_str());
+              } catch(const NSPluginException& e) {
+                log_broken_message(_T("Caught: ") + e.error_ + _T(" when trying to log a message..."));
+                return;
+              } catch(...) {
+                log_broken_message(_T("Caught: Unknown Exception when trying to log a message..."));
+                return;
+              }
             }
           }
-        }
-        log_cache_.clear();
-      }
-      for (pluginList::size_type i = 0; i< messageHandlers_.size(); i++) {
-        try {
-          messageHandlers_[i]->handleMessage(msgType, file, line, message.c_str());
-        } catch(const NSPluginException& e) {
-          log_broken_message(_T("Caught: ") + e.error_ + _T(" when trying to log a message..."));
-          return;
-        } catch(...) {
-          log_broken_message(_T("Caught: Unknown Exception when trying to log a message..."));
-          return;
-        }
-      }
-    }
+          log_cache_.clear();
+        }
+        for (pluginList::size_type i = 0; i< messageHandlers_.size(); i++) {
+          try {
+            messageHandlers_[i]->handleMessage(msgType, file, line, message.c_str());
+          } catch(const NSPluginException& e) {
+            log_broken_message(_T("Caught: ") + e.error_ + _T(" when trying to log a message..."));
+            return;
+          } catch(...) {
+            log_broken_message(_T("Caught: Unknown Exception when trying to log a message..."));
+            return;
+          }
+        }
+      }
+    }
+  } catch (...) {
+    log_broken_message(_T("Caught UNKNOWN Exception when trying to log a message: ") + message);
   }
 }
 std::wstring NSClientT::getBasePath(void) {
-  MutexLock lock(internalVariables);
-  if (!lock.hasMutex()) {
+  boost::unique_lock<boost::timed_mutex> lock(internalVariables, boost::get_system_time() + boost::posix_time::milliseconds(5000));
+  if (!lock.owns_lock()) {
     LOG_ERROR(_T("FATAL ERROR: Could not get mutex."));
     return _T("FATAL ERROR");

trunk/service/NSClient++.h

@@ -22 +22 @@
 
 #include <config.h>
-#include <ServiceCmd.h>
-#include <NTService.h>
+#include <service/system_service.hpp>
 #include "NSCPlugin.h"
 #include <Mutex.h>
@@ -31 +30 @@
 #include <com_helpers.hpp>
 #include <nsclient_session.hpp>
-
+#include <boost/thread/thread.hpp>
+#include <boost/thread/locks.hpp>
 
 /**
@@ -99 +99 @@
   pluginList messageHandlers_;
   std::wstring basePath;
-  MutexHandler internalVariables;
-  MutexHandler messageMutex;
+  boost::timed_mutex internalVariables;
+  boost::timed_mutex messageMutex;
   MutexRW  m_mutexRW;
   MutexRW  m_mutexRWcmdDescriptions;
@@ -180 +180 @@
 };
 
-typedef service_helper::NTService<NSClientT> NSClient;
+typedef service_helper::impl<NSClientT>::system_service NSClient;
 
 extern NSClient mainClient; // Global core instance forward declaration.
 
 
-std::wstring Encrypt(std::wstring str, unsigned int algorithm = NSCAPI::xor);
-std::wstring Decrypt(std::wstring str, unsigned int algorithm = NSCAPI::xor);
+std::wstring Encrypt(std::wstring str, unsigned int algorithm = NSCAPI::encryption_xor);
+std::wstring Decrypt(std::wstring str, unsigned int algorithm = NSCAPI::encryption_xor);
 
 //////////////////////////////////////////////////////////////////////////

trunk/service/StdAfx.h

@@ -20 +20 @@
 ***************************************************************************/
 #pragma once
-
+#ifdef WIN32
 #define _WINSOCKAPI_
 //#include <WinSock2.h>
+#include <tchar.h>
 
 #define _WIN32_DCOM
@@ -29 +30 @@
 #define VC_EXTRALEAN    // Exclude rarely-used stuff from Windows headers
 #include <windows.h>
-
+#endif 
 
 #define COMPILE_NEWAPIS_STUBS
@@ -36 +37 @@
 
 #include <iostream>
-#include <tchar.h>
 #include <string>
 #include <list>

trunk/service/core_api.cpp

@@ -26 +26 @@
 #include "settings_manager_impl.h"
 #include <b64/b64.h>
+#include <NSCHelper.h>
 
 
@@ -58 +59 @@
 }
 void NSAPIStopServer(void) {
+#ifdef WIN32
   serviceControll::StopNoWait(SZSERVICENAME);
+#endif
 }
 NSCAPI::nagiosReturn NSAPIInject(const TCHAR* command, const unsigned int argLen, TCHAR **argument, TCHAR *returnMessageBuffer, unsigned int returnMessageBufferLen, TCHAR *returnPerfBuffer, unsigned int returnPerfBufferLen) {
@@ -90 +93 @@
 
 NSCAPI::errorReturn NSAPIEncrypt(unsigned int algorithm, const TCHAR* inBuffer, unsigned int inBufLen, TCHAR* outBuf, unsigned int *outBufLen) {
-  if (algorithm != NSCAPI::xor) {
+  if (algorithm != NSCAPI::encryption_xor) {
     LOG_ERROR(_T("Unknown algortihm requested."));
     return NSCAPI::hasFailed;
   }
+  /*
+  TODO reimplement this
+
   std::wstring key = settings_manager::get_settings()->get_string(SETTINGS_KEY(protocol_def::MASTER_KEY));
   int tcharInBufLen = 0;
@@ -125 +131 @@
   outBuf[realOutLen] = 0;
   *outBufLen = static_cast<unsigned int>(realOutLen);
+  */
   return NSCAPI::isSuccess;
 }
 
 NSCAPI::errorReturn NSAPIDecrypt(unsigned int algorithm, const TCHAR* inBuffer, unsigned int inBufLen, TCHAR* outBuf, unsigned int *outBufLen) {
-  if (algorithm != NSCAPI::xor) {
+  if (algorithm != NSCAPI::encryption_xor) {
     LOG_ERROR(_T("Unknown algortihm requested."));
     return NSCAPI::hasFailed;
   }
+  /*
   int inBufLenC = 0;
   char *inBufferC = charEx::tchar_to_char(inBuffer, inBufLen, inBufLenC);
@@ -166 +174 @@
   outBuf[realOutLen] = 0;
   *outBufLen = static_cast<unsigned int>(realOutLen);
+  */
   return NSCAPI::isSuccess;
 }

@@ -11 +11 @@
 build.log
 AutoBuild.h.bak
+stage_cmake

@@ -1 +1 @@
 *.user
+Debug