Changeset 257

Timestamp:

02/18/10 12:22:51 (2 years ago)

Author:

mickem

Message:

Major update with a new plugin glue that works better with *nix.
Everything should be the same but look tidier

Location:

trunk

Files:

• CMakeLists.txt (modified) (2 diffs)
• build.cmake (modified) (1 diff)
• include/NSCAPI.h (modified) (1 diff)
• include/service/unix_service.hpp (modified) (1 diff)
• include/settings/macros.h (modified) (1 diff)
• modules/CheckExternalScripts/CheckExternalScripts.cpp (modified) (6 diffs)
• modules/CheckExternalScripts/CheckExternalScripts.def (modified) (1 diff)
• modules/CheckExternalScripts/CheckExternalScripts.h (modified) (4 diffs)
• modules/CheckExternalScripts/stdafx.h (modified) (1 diff)
• modules/CheckHelpers/CheckHelpers.cpp (modified) (7 diffs)
• modules/CheckHelpers/CheckHelpers.h (modified) (2 diffs)
• modules/CheckHelpers/stdafx.h (modified) (1 diff)
• modules/CheckSystem/CheckSystem.def (modified) (1 diff)
• modules/DebugLogMetrics/DebugLogMetrics.def (modified) (1 diff)
• modules/FileLogger/FileLogger.cpp (modified) (7 diffs)
• modules/FileLogger/FileLogger.def (modified) (1 diff)
• modules/FileLogger/FileLogger.h (modified) (2 diffs)
• modules/FileLogger/stdafx.h (modified) (1 diff)
• modules/NRPEClient/NRPEClient.cpp (modified) (4 diffs)
• modules/NRPEClient/NRPEClient.def (modified) (1 diff)
• modules/NRPEClient/NRPEClient.h (modified) (2 diffs)
• modules/NRPEClient/stdafx.h (modified) (1 diff)
• modules/NRPEServer/NRPEServer.cpp (modified) (2 diffs)
• modules/NRPEServer/NRPEServer.def (modified) (1 diff)
• modules/NRPEServer/NRPEServer.h (modified) (1 diff)
• modules/NRPEServer/nrpe_handler.cpp (modified) (3 diffs)
• modules/NRPEServer/stdafx.h (modified) (1 diff)
• modules/NSCAAgent/NSCAAgent.cpp (modified) (2 diffs)
• modules/NSCAAgent/NSCAAgent.h (modified) (2 diffs)
• modules/NSCAAgent/stdafx.h (modified) (1 diff)
• modules/NSClientListener/NSClientListener.def (modified) (1 diff)
• modules/Scheduler/Scheduler.cpp (modified) (6 diffs)
• modules/Scheduler/Scheduler.h (modified) (1 diff)
• modules/Scheduler/stdafx.h (modified) (1 diff)
• service/CMakeLists.txt (modified) (2 diffs)
• service/NSCPlugin.cpp (modified) (9 diffs)
• service/NSCPlugin.h (modified) (4 diffs)
• service/NSClient++.cpp (modified) (11 diffs)
• service/NSClient++.h (modified) (1 diff)
• service/commands.hpp (modified) (5 diffs)
• service/core_api.cpp (modified) (6 diffs)
• service/core_api.h (modified) (1 diff)
• service/simple_client.hpp (modified) (5 diffs)

trunk/CMakeLists.txt

@@ -167 +167 @@
 
 SET(NSCP_DEF_PLUGIN_CPP
-  ${NSCP_INCLUDE_PATH}/NSCHelper.cpp
   ${NSCP_INCLUDE_PATH}/arrayBuffer.cpp
   ${NSCP_INCLUDE_PATH}/simpleini/ConvertUTF.c
   ${NSCP_INCLUDE_PATH}/b64/b64.c
   ${NSCP_INCLUDE_PATH}/utils.cpp
+  ${NSCP_INCLUDE_PATH}/nscapi/nscapi_helper.cpp
+  ${NSCP_INCLUDE_PATH}/nscapi/nscapi_plugin_wrapper.cpp
+  ${NSCP_INCLUDE_PATH}/nscapi/nscapi_core_wrapper.cpp
 )
 
 SET(NSCP_DEF_PLUGIN_HPP
-  ${NSCP_INCLUDE_PATH}/NSCHelper.h
   ${NSCP_INCLUDE_PATH}/strEx.h
   ${NSCP_INCLUDE_PATH}/config.h
   ${NSCP_INCLUDE_PATH}/utils.h
   ${NSCP_INCLUDE_PATH}/NSCAPI.h
-  ${NSCP_INCLUDE_PATH}/NSCHelper.h
-  ${NSCP_INCLUDE_PATH}/nsc_module_wrapper.hpp
+  ${NSCP_INCLUDE_PATH}/nscapi/macros.hpp
+  ${NSCP_INCLUDE_PATH}/nscapi/nscapi_helper.hpp
+  ${NSCP_INCLUDE_PATH}/nscapi/nscapi_plugin_wrapper.hpp 
+  ${NSCP_INCLUDE_PATH}/nscapi/nscapi_core_wrapper.hpp
 )
 
@@ -244 +247 @@
 endif()
 
-IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC"  )
-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -fPIC"  )
-ENDIF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
-
-
+IF(CMAKE_COMPILER_IS_GNUCXX)
+  IF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND NOT APPLE)
+    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC"  )
+    SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_DEBUG} -fPIC"  )
+  ENDIF("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64" AND NOT APPLE)
+ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
+

trunk/build.cmake

@@ +1 @@
+IF(WIN32)
+
 SET(Boost_DEBUG 1)
 
-#set(Boost_USE_STATIC_LIBS   ON)
+set(Boost_USE_STATIC_LIBS   ON)
 set(BOOST_USE_MULTITHREADED ON)
 
-SET(BOOST_INCLUDEDIR c:/src/include/boost-1_39)
-SET(BOOST_LIBRARYDIR c:/src/lib/x86/)
-SET(BOOST_LIB_SUFFIX vc80-mt)
-#SET(BOOST_LIB_VERSION 1.40)
+SET(BOOST_INCLUDEDIR D:/source/include/)
+SET(BOOST_LIBRARYDIR D:/source/lib/x86)
+#SET(BOOST_LIB_SUFFIX vc80-mt)
+#SET(Boost_VERSION 1.40)
 
 
-SET(OPENSSL_INCLUDE_DIR c:/src/include/)
-SET(CMAKE_LIBRARY_PATH c:/src/lib/x86/)
+SET(OPENSSL_INCLUDE_DIR D:/source/include/)
+SET(CMAKE_LIBRARY_PATH D:/source/lib/x86/)
 
-#SET(PROTOBUF_INCLUDE_DIR C:/src/protobuf-2.3.0/src)
-#SET(PROTOBUF_LIBRARYDIR C:/src/protobuf-2.3.0/vsprojects/Debug)
-#SET(PROTOBUF_BINARYDIR C:/src/protobuf-2.3.0/vsprojects/Debug)
+SET(PROTOBUF_INCLUDE_DIR D:/source/protobuf-2.3.0/src)
+SET(PROTOBUF_LIBRARYDIR D:/source/protobuf-2.3.0/vsprojects/Debug)
+SET(PROTOBUF_BINARYDIR D:/source/protobuf-2.3.0/vsprojects/Debug)
 
 #SET(PROTOBUF_LIBRARYDIR C:/src/protobuf-2.3.0/vsprojects/Release)
 #SET(PROTOBUF_BINARYDIR C:/src/protobuf-2.3.0/vsprojects/Release)
 
+SET(CRYPTOPP_SOURCE d:/source/libs-c/crypto++-5.6.0)
 
-SET(CRYPTOPP_DIR C:/src/lib-src/Crypto++5.6.0)
+ELSE(WIN32)
 
+ENDIF(WIN32)

trunk/include/NSCAPI.h

@@ -106 +106 @@
 };
 
-namespace NSCModuleHelper {
-  typedef void* (*lpNSAPILoader)(wchar_t*);
+namespace nscapi {
+
+
+  class nscapi_exception {
+  public:
+    std::wstring msg_;
+    nscapi_exception(std::wstring msg) : msg_(msg) {}
+  };
+
+  namespace core_api {
+    typedef void* (*lpNSAPILoader)(const wchar_t*);
+
+    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*, wchar_t***, unsigned int *);
+    typedef NSCAPI::errorReturn (*lpNSAPIReleaseSettingsSectionBuffer)(wchar_t***, unsigned int *);
+    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 wchar_t*, const char *, const unsigned int, char **, unsigned int *);
+    typedef void (*lpNSAPIDestroyBuffer)(char**);
+
+    typedef NSCAPI::errorReturn (*lpNSAPINotify)(const wchar_t*, const wchar_t*, NSCAPI::nagiosReturn, const char*, unsigned int);
+
+    typedef NSCAPI::boolReturn (*lpNSAPICheckLogMessages)(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 wchar_t*,wchar_t*,unsigned int);
+    typedef NSCAPI::errorReturn (*lpNSAPIGetAllCommandNames)(wchar_t***, unsigned int *);
+    typedef NSCAPI::errorReturn (*lpNSAPIReleaseAllCommandNamessBuffer)(wchar_t***, unsigned int *);
+    typedef NSCAPI::errorReturn (*lpNSAPIRegisterCommand)(unsigned int, 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[]);
+    typedef NSCAPI::errorReturn (*lpNSAPISettingsSave)(void);
+  }
+
+  namespace plugin_api {
+    typedef int (*lpModuleHelperInit)(unsigned int, ::nscapi::core_api::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 char*,const unsigned int,char**,unsigned int*);
+    typedef int (*lpDeleteBuffer)(char**);
+    typedef int (*lpCommandLineExec)(const unsigned int,wchar_t**);
+    typedef int (*lpHandleMessage)(int,const wchar_t*,const int,const wchar_t*);
+    typedef int (*lpUnLoadModule)();
+    typedef void (*lpShowTray)();
+    typedef void (*lpHideTray)();
+    typedef int (*lpHasNotificationHandler)();
+    typedef int (*lpHandleNotification)(const wchar_t *channel, const wchar_t* command, NSCAPI::nagiosReturn code, char* result, unsigned int result_len);
+  }
 }

trunk/include/service/unix_service.hpp

@@ -63 +63 @@
     virtual ~unix_service() {
     }
-    inline void print_debug(std::wstring s) {
+    inline void print_debug(const std::wstring s) {
       std::wcout << s << std::endl;
     }
-    inline void print_debug(wchar_t *s) {
+    inline void print_debug(const wchar_t *s) {
       std::wcout << s << std::endl;
     }

trunk/include/settings/macros.h

@@ -103 +103 @@
     DEFINE_SETTING_S(SYSTRAY_EXE, DEFAULT_SECTION, "systray_exe", "nstray.exe");
     DESCRIBE_SETTING(SYSTRAY_EXE, "TODO", "TODO");
-
-
   }
 

trunk/modules/CheckExternalScripts/CheckExternalScripts.cpp

@@ -42 +42 @@
   boost::filesystem::wpath path = str_path;
   if (path.has_relative_path())
-    path = NSCModuleHelper::getBasePath() / path;
+    path = GET_CORE()->getBasePath() / path;
   file_helpers::patterns::pattern_type split_path = file_helpers::patterns::split_pattern(path);
   if (!boost::filesystem::is_directory(split_path.first))
@@ -72 +72 @@
   allowNasty_ = SETTINGS_GET_BOOL(nrpe::ALLOW_NASTY);
   std::list<std::wstring>::const_iterator it;
-  std::list<std::wstring> commands = NSCModuleHelper::getSettingsSection(setting_keys::external_scripts::SCRIPT_SECTION_PATH);
+  std::list<std::wstring> commands = GET_CORE()->getSettingsSection(setting_keys::external_scripts::SCRIPT_SECTION_PATH);
   for (it = commands.begin(); it != commands.end(); ++it) {
     if ((*it).empty())
       continue;
     NSC_DEBUG_MSG_STD(_T("Looking under: ") + setting_keys::external_scripts::SCRIPT_SECTION_PATH + _T(", ") + (*it));
-    std::wstring s = NSCModuleHelper::getSettingsString(setting_keys::external_scripts::SCRIPT_SECTION_PATH, (*it), _T(""));
+    std::wstring s = GET_CORE()->getSettingsString(setting_keys::external_scripts::SCRIPT_SECTION_PATH, (*it), _T(""));
     if (s.empty()) {
       NSC_LOG_ERROR_STD(_T("Invalid command definition: ") + (*it));
@@ -86 +86 @@
   }
 
-  commands = NSCModuleHelper::getSettingsSection(setting_keys::external_scripts::ALIAS_SECTION_PATH);
+  commands = GET_CORE()->getSettingsSection(setting_keys::external_scripts::ALIAS_SECTION_PATH);
   for (it = commands.begin(); it != commands.end(); ++it) {
     if ((*it).empty())
       continue;
-    std::wstring s = NSCModuleHelper::getSettingsString(setting_keys::external_scripts::ALIAS_SECTION_PATH, (*it), _T(""));
+    std::wstring s = GET_CORE()->getSettingsString(setting_keys::external_scripts::ALIAS_SECTION_PATH, (*it), _T(""));
     if (s.empty()) {
       NSC_LOG_ERROR_STD(_T("Invalid command definition: ") + (*it));
@@ -102 +102 @@
     addAllScriptsFrom(scriptDirectory_);
   }
-  root_ = NSCModuleHelper::getBasePath();
+  root_ = GET_CORE()->getBasePath();
   return true;
 }
@@ -145 +145 @@
   }
   if (isAlias) {
-    return NSCModuleHelper::InjectSplitAndCommand(cd.command, args, ' ', message, perf, true);
+    return GET_CORE()->InjectSplitAndCommand(cd.command, args, ' ', message, perf, true);
   } else {
     int result = process::executeProcess(process::exec_arguments(root_, cd.command + _T(" ") + args, timeout), message, perf);
-    if (!NSCHelper::isNagiosReturnCode(result)) {
+    if (!nscapi::plugin_helper::isNagiosReturnCode(result)) {
       NSC_LOG_ERROR_STD(_T("The command (") + cd.command + _T(") returned an invalid return code: ") + strEx::itos(result));
       return NSCAPI::returnUNKNOWN;
     }
-    return NSCHelper::int2nagios(result);
+    return nscapi::plugin_helper::int2nagios(result);
     /*
   } else if (cd.type == script_dir) {
@@ -171 +171 @@
 NSC_WRAPPERS_IGNORE_MSG_DEF();
 NSC_WRAPPERS_HANDLE_CMD_DEF(gCheckExternalScripts);
-NSC_WRAPPERS_HANDLE_CONFIGURATION(gCheckExternalScripts);
 
-
-MODULE_SETTINGS_START(CheckExternalScripts, _T("NRPE Listener configuration"), _T("...")) 
-
-PAGE(_T("NRPE Listsner configuration")) 
-
-ITEM_EDIT_TEXT(_T("port"), _T("This is the port the CheckExternalScripts.dll will listen to.")) 
-ITEM_MAP_TO(_T("basic_ini_text_mapper")) 
-OPTION(_T("section"), _T("NRPE")) 
-OPTION(_T("key"), _T("port")) 
-OPTION(_T("default"), _T("5666")) 
-ITEM_END()
-
-ITEM_CHECK_BOOL(_T("allow_arguments"), _T("This option determines whether or not the NRPE daemon will allow clients to specify arguments to commands that are executed.")) 
-ITEM_MAP_TO(_T("basic_ini_bool_mapper")) 
-OPTION(_T("section"), _T("NRPE")) 
-OPTION(_T("key"), _T("allow_arguments")) 
-OPTION(_T("default"), _T("false")) 
-OPTION(_T("true_value"), _T("1")) 
-OPTION(_T("false_value"), _T("0")) 
-ITEM_END()
-
-ITEM_CHECK_BOOL(_T("allow_nasty_meta_chars"), _T("This might have security implications (depending on what you do with the options)")) 
-ITEM_MAP_TO(_T("basic_ini_bool_mapper")) 
-OPTION(_T("section"), _T("NRPE")) 
-OPTION(_T("key"), _T("allow_nasty_meta_chars")) 
-OPTION(_T("default"), _T("false")) 
-OPTION(_T("true_value"), _T("1")) 
-OPTION(_T("false_value"), _T("0")) 
-ITEM_END()
-
-ITEM_CHECK_BOOL(_T("use_ssl"), _T("This option will enable SSL encryption on the NRPE data socket (this increases security somwhat.")) 
-ITEM_MAP_TO(_T("basic_ini_bool_mapper")) 
-OPTION(_T("section"), _T("NRPE")) 
-OPTION(_T("key"), _T("use_ssl")) 
-OPTION(_T("default"), _T("true")) 
-OPTION(_T("true_value"), _T("1")) 
-OPTION(_T("false_value"), _T("0")) 
-ITEM_END()
-
-PAGE_END()
-ADVANCED_PAGE(_T("Access configuration")) 
-
-ITEM_EDIT_OPTIONAL_LIST(_T("Allow connection from:"), _T("This is the hosts that will be allowed to poll performance data from the NRPE server.")) 
-OPTION(_T("disabledCaption"), _T("Use global settings (defined previously)")) 
-OPTION(_T("enabledCaption"), _T("Specify hosts for NRPE server")) 
-OPTION(_T("listCaption"), _T("Add all IP addresses (not hosts) which should be able to connect:")) 
-OPTION(_T("separator"), _T(",")) 
-OPTION(_T("disabled"), _T("")) 
-ITEM_MAP_TO(_T("basic_ini_text_mapper")) 
-OPTION(_T("section"), _T("NRPE")) 
-OPTION(_T("key"), _T("allowed_hosts")) 
-OPTION(_T("default"), _T("")) 
-ITEM_END()
-
-PAGE_END()
-MODULE_SETTINGS_END()

trunk/modules/CheckExternalScripts/CheckExternalScripts.def

@@ -11 +11 @@
   NSHandleCommand
   NSUnloadModule
-  NSGetConfigurationMeta
   NSGetModuleDescription
   NSDeleteBuffer

trunk/modules/CheckExternalScripts/CheckExternalScripts.h

@@ -25 +25 @@
 #include <execute_process.hpp>
 
-class CheckExternalScripts : public NSCModuleHelper::SimpleCommand {
+class CheckExternalScripts : public nscapi::impl::SimpleCommand {
 private:
   struct command_data {
@@ -56 +56 @@
     return _T("Check External Scripts");
   }
-  NSCModuleWrapper::module_version getModuleVersion() {
-    NSCModuleWrapper::module_version version = {0, 0, 1 };
+  nscapi::plugin_wrapper::module_version getModuleVersion() {
+    nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;
   }
@@ -88 +88 @@
     command_data cd = command_data(cmd, args);
     commands[key] = cd;
-    NSCModuleHelper::registerCommand(key, _T("Script: ") + cd.to_string());
+    GET_CORE()->registerCommand(key, _T("Script: ") + cd.to_string());
   }
   void addAlias(std::wstring key, std::wstring cmd, std::wstring args) {
@@ -94 +94 @@
     command_data cd = command_data(cmd, args);
     alias[key] = cd;
-    NSCModuleHelper::registerCommand(key, _T("Alias for: ") + cd.to_string());
+    GET_CORE()->registerCommand(key, _T("Alias for: ") + cd.to_string());
   }
 };

trunk/modules/CheckExternalScripts/stdafx.h

@@ -29 +29 @@
 #include <types.hpp>
 #include <NSCAPI.h>
-#include <nsc_module_wrapper.hpp>
-#include <NSCHelper.h>
+#include <nscapi/plugin.hpp>
 
 #ifdef MEMCHECK

trunk/modules/CheckHelpers/CheckHelpers.cpp

@@ -35 +35 @@
 bool CheckHelpers::loadModule(NSCAPI::moduleLoadMode mode) {
   try {
-    NSCModuleHelper::registerCommand(_T("CheckAlwaysOK"), _T("Run another check and regardless of its return code return OK."));
-    NSCModuleHelper::registerCommand(_T("CheckAlwaysCRITICAL"), _T("Run another check and regardless of its return code return CRIT."));
-    NSCModuleHelper::registerCommand(_T("CheckAlwaysWARNING"), _T("Run another check and regardless of its return code return WARN."));
-    NSCModuleHelper::registerCommand(_T("CheckMultiple"), _T("Run more then one check and return the worst state."));
-    NSCModuleHelper::registerCommand(_T("CheckOK"), _T("Just return OK (anything passed along will be used as a message)."));
-    NSCModuleHelper::registerCommand(_T("check_ok"), _T("Just return OK (anything passed along will be used as a message)."));
-    NSCModuleHelper::registerCommand(_T("CheckWARNING"), _T("Just return WARN (anything passed along will be used as a message)."));
-    NSCModuleHelper::registerCommand(_T("CheckCRITICAL"), _T("Just return CRIT (anything passed along will be used as a message)."));
-    NSCModuleHelper::registerCommand(_T("CheckVersion"), _T("Just return the nagios version (along with OK status)."));
-  } catch (NSCModuleHelper::NSCMHExcpetion &e) {
+    GET_CORE()->registerCommand(_T("CheckAlwaysOK"), _T("Run another check and regardless of its return code return OK."));
+    GET_CORE()->registerCommand(_T("CheckAlwaysCRITICAL"), _T("Run another check and regardless of its return code return CRIT."));
+    GET_CORE()->registerCommand(_T("CheckAlwaysWARNING"), _T("Run another check and regardless of its return code return WARN."));
+    GET_CORE()->registerCommand(_T("CheckMultiple"), _T("Run more then one check and return the worst state."));
+    GET_CORE()->registerCommand(_T("CheckOK"), _T("Just return OK (anything passed along will be used as a message)."));
+    GET_CORE()->registerCommand(_T("check_ok"), _T("Just return OK (anything passed along will be used as a message)."));
+    GET_CORE()->registerCommand(_T("CheckWARNING"), _T("Just return WARN (anything passed along will be used as a message)."));
+    GET_CORE()->registerCommand(_T("CheckCRITICAL"), _T("Just return CRIT (anything passed along will be used as a message)."));
+    GET_CORE()->registerCommand(_T("CheckVersion"), _T("Just return the nagios version (along with OK status)."));
+  } catch (nscapi::nscapi_exception &e) {
     NSC_LOG_ERROR_STD(_T("Failed to register command: ") + e.msg_);
   } catch (...) {
@@ -65 +65 @@
   NSCAPI::nagiosReturn returnCode = NSCAPI::returnOK;
   if (arguments.empty()) {
-    message = NSCHelper::translateReturn(status) + _T(": Lets pretend everything is going to be ok.");
+    message = nscapi::plugin_helper::translateReturn(status) + _T(": Lets pretend everything is going to be ok.");
     return status;
   }
@@ -76 +76 @@
 NSCAPI::nagiosReturn CheckHelpers::handleCommand(const std::wstring command, std::list<std::wstring> arguments, std::wstring &message, std::wstring &perf) {
   if (command == _T("CheckVersion")) {
-    message = NSCModuleHelper::getApplicationVersionString();
+    message = GET_CORE()->getApplicationVersionString();
     return NSCAPI::returnOK;
   } else if (command == _T("CheckAlwaysOK")) {
@@ -84 +84 @@
     }
     std::wstring new_command = arguments.front(); arguments.pop_front();
-    NSCModuleHelper::InjectSimpleCommand(new_command, arguments, message, perf);
+    GET_CORE()->InjectSimpleCommand(new_command, arguments, message, perf);
     return NSCAPI::returnOK;
-  } else if (command == _T("CheckVersion")) {
-    message = NSCModuleHelper::getApplicationVersionString();
-    return NSCAPI::returnOK;
-  } else if (command == _T("CheckOK")) {
-    return checkSimpleStatus(NSCAPI::returnOK, arguments, message, perf);
-  } else if (command == _T("CheckWARNING")) {
-    return checkSimpleStatus(NSCAPI::returnWARN, arguments, message, perf);
-  } else if (command == _T("CheckCRITICAL")) {
-    return checkSimpleStatus(NSCAPI::returnCRIT, arguments, message, perf);
   } else if (command == _T("CheckAlwaysCRITICAL")) {
     if (arguments.size() < 1) {
@@ -101 +92 @@
     }
     std::wstring new_command = arguments.front(); arguments.pop_front();
-    NSCModuleHelper::InjectSimpleCommand(new_command, arguments, message, perf);
+    GET_CORE()->InjectSimpleCommand(new_command, arguments, message, perf);
     return NSCAPI::returnCRIT;
   } else if (command == _T("CheckAlwaysWARNING")) {
@@ -109 +100 @@
     }
     std::wstring new_command = arguments.front(); arguments.pop_front();
-    NSCModuleHelper::InjectSimpleCommand(new_command, arguments, message, perf);
+    GET_CORE()->InjectSimpleCommand(new_command, arguments, message, perf);
     return NSCAPI::returnWARN;
   } else if (command == _T("CheckOK")) {
@@ -153 +144 @@
     std::list<std::wstring> sub_args;
     std::wstring tMsg, tPerf;
-    NSCAPI::nagiosReturn tRet = NSCModuleHelper::InjectSimpleCommand((*cit2).first.c_str(), (*cit2).second, tMsg, tPerf);
-    returnCode = NSCHelper::maxState(returnCode, tRet);
+    NSCAPI::nagiosReturn tRet = GET_CORE()->InjectSimpleCommand((*cit2).first.c_str(), (*cit2).second, tMsg, tPerf);
+    returnCode = nscapi::plugin_helper::maxState(returnCode, tRet);
     if (!message.empty())
       message += _T(", ");

trunk/modules/CheckHelpers/CheckHelpers.h

@@ -23 +23 @@
 #include <strEx.h>
 
-class CheckHelpers : public NSCModuleHelper::SimpleCommand {
+class CheckHelpers : public nscapi::impl::SimpleCommand {
 private:
 
@@ -37 +37 @@
     return _T("Helper function");
   }
-  NSCModuleWrapper::module_version getModuleVersion() {
-    NSCModuleWrapper::module_version version = {0, 3, 0 };
+  nscapi::plugin_wrapper::module_version getModuleVersion() {
+    nscapi::plugin_wrapper::module_version version = {0, 3, 0 };
     return version;
   }

trunk/modules/CheckHelpers/stdafx.h

@@ -28 +28 @@
 
 #include <NSCAPI.h>
-#include <nsc_module_wrapper.hpp>
-#include <NSCHelper.h>
+#include <nscapi/plugin.hpp>
 

trunk/modules/CheckSystem/CheckSystem.def

@@ -11 +11 @@
   NSHandleCommand
   NSUnloadModule
-  NSGetConfigurationMeta
   NSGetModuleDescription
   NSCommandLineExec

trunk/modules/DebugLogMetrics/DebugLogMetrics.def

@@ -11 +11 @@
   NSHandleCommand
   NSUnloadModule
-  NSGetConfigurationMeta
   NSGetModuleDescription

trunk/modules/FileLogger/FileLogger.cpp

@@ -54 +54 @@
 std::wstring getFolder(std::wstring key) {
   if (key == _T("exe")) {
-    return NSCModuleHelper::getBasePath();
+    return GET_CORE()->getBasePath();
   } else {
 #ifdef WIN32
@@ -64 +64 @@
 #endif
   }
-  return NSCModuleHelper::getBasePath();
+  return GET_CORE()->getBasePath();
 }
 std::string FileLogger::getFileName() {
@@ -94 +94 @@
     SETTINGS_REG_KEY_S(log::LOG_MASK);
 
-  } catch (NSCModuleHelper::NSCMHExcpetion &e) {
+  } catch (nscapi::nscapi_exception &e) {
     NSC_LOG_ERROR_STD(_T("Failed to register command: ") + e.msg_);
   } catch (...) {
@@ -103 +103 @@
   format_ = to_string(SETTINGS_GET_STRING(log::DATEMASK));
   std::wstring log_mask = SETTINGS_GET_STRING(log::LOG_MASK);
-  log_mask_ = NSCHelper::logging::parse(log_mask);
-  NSC_LOG_MESSAGE_STD(_T("Using logmask: ") + NSCHelper::logging::to_string(log_mask_));
+  log_mask_ = nscapi::logging::parse(log_mask);
+  NSC_LOG_MESSAGE_STD(_T("Using logmask: ") + nscapi::logging::to_string(log_mask_));
   init_ = true;
-  std::wstring hello = _T("Starting to log for: ") + NSCModuleHelper::getApplicationName() + _T(" - ") + NSCModuleHelper::getApplicationVersionString();
+  std::wstring hello = _T("Starting to log for: ") + GET_CORE()->getApplicationName() + _T(" - ") + GET_CORE()->getApplicationVersionString();
   handleMessage(NSCAPI::log, __FILEW__, __LINE__, hello.c_str());
   NSC_LOG_MESSAGE_STD(_T("Log path is: ") + to_wstring(file_));
@@ -135 +135 @@
 */
 
-void FileLogger::handleMessage(int msgType, TCHAR* file, int line, const TCHAR* message) {
+void FileLogger::handleMessage(int msgType, const wchar_t* file, int line, const TCHAR* message) {
   if (!init_) {
     std::wcout << _T("Discarding: ") << message << std::endl;
     return;
   }
-  if (!NSCHelper::logging::matches(log_mask_, msgType))
+  if (!nscapi::logging::matches(log_mask_, msgType))
     return;
 
@@ -148 +148 @@
   }
   stream << to_string(get_formated_date()) 
-    << (": ") << to_string(NSCHelper::translateMessageType(msgType))
+    << (": ") << to_string(nscapi::plugin_helper::translateMessageType(msgType))
     << (":") << to_string(std::wstring(file))
     <<(":") << to_string(line) 
@@ -166 +166 @@
 NSC_WRAPPERS_HANDLE_MSG_DEF(gFileLogger);
 NSC_WRAPPERS_IGNORE_CMD_DEF();
-NSC_WRAPPERS_HANDLE_CONFIGURATION(gFileLogger);
-
-MODULE_SETTINGS_START(FileLogger, _T("File logger configuration"),_T("..."))
-MODULE_SETTINGS_END()

trunk/modules/FileLogger/FileLogger.def

@@ -11 +11 @@
   NSHandleCommand
   NSUnloadModule
-  NSGetConfigurationMeta
   NSGetModuleDescription
   NSDeleteBuffer

trunk/modules/FileLogger/FileLogger.h

@@ -42 +42 @@
     return _T("File logger");
   }
-  NSCModuleWrapper::module_version getModuleVersion() {
-    NSCModuleWrapper::module_version version = {0, 0, 1 };
+  nscapi::plugin_wrapper::module_version getModuleVersion() {
+    nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;
   }
@@ -52 +52 @@
   bool hasCommandHandler();
   bool hasMessageHandler();
-  void handleMessage(int msgType, TCHAR* file, int line, const TCHAR* message);
+  void handleMessage(int msgType, const wchar_t* file, int line, const TCHAR* message);
   int handleCommand(TCHAR* command, TCHAR **argument, TCHAR *returnBuffer, int returnBufferLen);
   //void writeEntry(std::wstring line);

trunk/modules/FileLogger/stdafx.h

@@ -27 +27 @@
 
 #include <NSCAPI.h>
-#include <NSCHelper.h>
-#include <nsc_module_wrapper.hpp>
-
+#include <nscapi/plugin.hpp>
 #include <config.h>
 

trunk/modules/NRPEClient/NRPEClient.cpp

@@ -45 +45 @@
   try {
     SETTINGS_REG_PATH(nrpe::CH_SECTION);
-    commands = NSCModuleHelper::getSettingsSection(setting_keys::nrpe::CH_SECTION_PATH);
-  } catch (NSCModuleHelper::NSCMHExcpetion &e) {
+    commands = GET_CORE()->getSettingsSection(setting_keys::nrpe::CH_SECTION_PATH);
+  } catch (nscapi::nscapi_exception &e) {
     NSC_LOG_ERROR_STD(_T("Failed to register command: ") + e.msg_);
   } catch (...) {
@@ -52 +52 @@
   }
 
-  boost::filesystem::wpath p = NSCModuleHelper::getBasePath() + std::wstring(_T("security/nrpe_dh_512.pem"));
+  boost::filesystem::wpath p = GET_CORE()->getBasePath() + std::wstring(_T("security/nrpe_dh_512.pem"));
   cert_ = p.string();
   if (boost::filesystem::is_regular(p)) {
@@ -63 +63 @@
   for (std::list<std::wstring>::const_iterator it = commands.begin(); it != commands.end(); ++it) {
     NSC_DEBUG_MSG_STD(*it);
-    std::wstring s = NSCModuleHelper::getSettingsString(setting_keys::nrpe::CH_SECTION_PATH, (*it), _T(""));
+    std::wstring s = GET_CORE()->getSettingsString(setting_keys::nrpe::CH_SECTION_PATH, (*it), _T(""));
     if (s.empty()) {
       NSC_LOG_ERROR_STD(_T("Invalid NRPE-client entry: ") + (*it));
@@ -276 +276 @@
 NSC_WRAPPERS_IGNORE_MSG_DEF();
 NSC_WRAPPERS_HANDLE_CMD_DEF(gNRPEClient);
-NSC_WRAPPERS_HANDLE_CONFIGURATION(gNRPEClient);
 NSC_WRAPPERS_CLI_DEF(gNRPEClient);
 
-
-MODULE_SETTINGS_START(NRPEClient, _T("NRPE Listener configuration"), _T("...")) 
-
-PAGE(_T("NRPE Listsner configuration")) 
-
-ITEM_EDIT_TEXT(_T("port"), _T("This is the port the NRPEClient.dll will listen to.")) 
-ITEM_MAP_TO(_T("basic_ini_text_mapper")) 
-OPTION(_T("section"), _T("NRPE")) 
-OPTION(_T("key"), _T("port")) 
-OPTION(_T("default"), _T("5666")) 
-ITEM_END()
-
-ITEM_CHECK_BOOL(_T("allow_arguments"), _T("This option determines whether or not the NRPE daemon will allow clients to specify arguments to commands that are executed.")) 
-ITEM_MAP_TO(_T("basic_ini_bool_mapper")) 
-OPTION(_T("section"), _T("NRPE")) 
-OPTION(_T("key"), _T("allow_arguments")) 
-OPTION(_T("default"), _T("false")) 
-OPTION(_T("true_value"), _T("1")) 
-OPTION(_T("false_value"), _T("0")) 
-ITEM_END()
-
-ITEM_CHECK_BOOL(_T("allow_nasty_meta_chars"), _T("This might have security implications (depending on what you do with the options)")) 
-ITEM_MAP_TO(_T("basic_ini_bool_mapper")) 
-OPTION(_T("section"), _T("NRPE")) 
-OPTION(_T("key"), _T("allow_nasty_meta_chars")) 
-OPTION(_T("default"), _T("false")) 
-OPTION(_T("true_value"), _T("1")) 
-OPTION(_T("false_value"), _T("0")) 
-ITEM_END()
-
-ITEM_CHECK_BOOL(_T("use_ssl"), _T("This option will enable SSL encryption on the NRPE data socket (this increases security somwhat.")) 
-ITEM_MAP_TO(_T("basic_ini_bool_mapper")) 
-OPTION(_T("section"), _T("NRPE")) 
-OPTION(_T("key"), _T("use_ssl")) 
-OPTION(_T("default"), _T("true")) 
-OPTION(_T("true_value"), _T("1")) 
-OPTION(_T("false_value"), _T("0")) 
-ITEM_END()
-
-PAGE_END()
-ADVANCED_PAGE(_T("Access configuration")) 
-
-ITEM_EDIT_OPTIONAL_LIST(_T("Allow connection from:"), _T("This is the hosts that will be allowed to poll performance data from the NRPE server.")) 
-OPTION(_T("disabledCaption"), _T("Use global settings (defined previously)")) 
-OPTION(_T("enabledCaption"), _T("Specify hosts for NRPE server")) 
-OPTION(_T("listCaption"), _T("Add all IP addresses (not hosts) which should be able to connect:")) 
-OPTION(_T("separator"), _T(",")) 
-OPTION(_T("disabled"), _T("")) 
-ITEM_MAP_TO(_T("basic_ini_text_mapper")) 
-OPTION(_T("section"), _T("NRPE")) 
-OPTION(_T("key"), _T("allowed_hosts")) 
-OPTION(_T("default"), _T("")) 
-ITEM_END()
-
-PAGE_END()
-MODULE_SETTINGS_END()

trunk/modules/NRPEClient/NRPEClient.def

@@ -11 +11 @@
   NSHandleCommand
   NSUnloadModule
-  NSGetConfigurationMeta
   NSGetModuleDescription
   NSCommandLineExec

trunk/modules/NRPEClient/NRPEClient.h

@@ -25 +25 @@
 
 
-class NRPEClient : public NSCModuleHelper::SimpleCommand {
+class NRPEClient : public nscapi::impl::SimpleCommand {
 private:
   typedef enum {
@@ -104 +104 @@
 #endif
   }
-  NSCModuleWrapper::module_version getModuleVersion() {
-    NSCModuleWrapper::module_version version = {0, 0, 1 };
+  nscapi::plugin_wrapper::module_version getModuleVersion() {
+    nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;
   }

trunk/modules/NRPEClient/stdafx.h

@@ -40 +40 @@
 
 #include <NSCAPI.h>
-#include <NSCHelper.h>
-#include <nsc_module_wrapper.hpp>
+#include <nscapi/plugin.hpp>
 namespace po = boost::program_options;
 

trunk/modules/NRPEServer/NRPEServer.cpp

@@ -100 +100 @@
     return false;
   }
-  root_ = NSCModuleHelper::getBasePath();
+  root_ = GET_CORE()->getBasePath();
   return true;
 }
@@ -304 +304 @@
 NSC_WRAPPERS_IGNORE_MSG_DEF();
 NSC_WRAPPERS_IGNORE_CMD_DEF();
-NSC_WRAPPERS_HANDLE_CONFIGURATION(gNRPEListener);
-
-
-MODULE_SETTINGS_START(NRPEListener, _T("NRPE Listener configuration"), _T("...")) 
-
-PAGE(_T("NRPE Listsner configuration")) 
-
-ITEM_EDIT_TEXT(_T("port"), _T("This is the port the NRPEListener.dll will listen to.")) 
-ITEM_MAP_TO(_T("basic_ini_text_mapper")) 
-OPTION(_T("section"), _T("NRPE")) 
-OPTION(_T("key"), _T("port")) 
-OPTION(_T("default"), _T("5666")) 
-ITEM_END()
-
-ITEM_CHECK_BOOL(_T("allow_arguments"), _T("This option determines whether or not the NRPE daemon will allow clients to specify arguments to commands that are executed.")) 
-ITEM_MAP_TO(_T("basic_ini_bool_mapper")) 
-OPTION(_T("section"), _T("NRPE")) 
-OPTION(_T("key"), _T("allow_arguments")) 
-OPTION(_T("default"), _T("false")) 
-OPTION(_T("true_value"), _T("1")) 
-OPTION(_T("false_value"), _T("0")) 
-ITEM_END()
-
-ITEM_CHECK_BOOL(_T("allow_nasty_meta_chars"), _T("This might have security implications (depending on what you do with the options)")) 
-ITEM_MAP_TO(_T("basic_ini_bool_mapper")) 
-OPTION(_T("section"), _T("NRPE")) 
-OPTION(_T("key"), _T("allow_nasty_meta_chars")) 
-OPTION(_T("default"), _T("false")) 
-OPTION(_T("true_value"), _T("1")) 
-OPTION(_T("false_value"), _T("0")) 
-ITEM_END()
-
-ITEM_CHECK_BOOL(_T("use_ssl"), _T("This option will enable SSL encryption on the NRPE data socket (this increases security somwhat.")) 
-ITEM_MAP_TO(_T("basic_ini_bool_mapper")) 
-OPTION(_T("section"), _T("NRPE")) 
-OPTION(_T("key"), _T("use_ssl")) 
-OPTION(_T("default"), _T("true")) 
-OPTION(_T("true_value"), _T("1")) 
-OPTION(_T("false_value"), _T("0")) 
-ITEM_END()
-
-PAGE_END()
-ADVANCED_PAGE(_T("Access configuration")) 
-
-ITEM_EDIT_OPTIONAL_LIST(_T("Allow connection from:"), _T("This is the hosts that will be allowed to poll performance data from the NRPE server.")) 
-OPTION(_T("disabledCaption"), _T("Use global settings (defined previously)")) 
-OPTION(_T("enabledCaption"), _T("Specify hosts for NRPE server")) 
-OPTION(_T("listCaption"), _T("Add all IP addresses (not hosts) which should be able to connect:")) 
-OPTION(_T("separator"), _T(",")) 
-OPTION(_T("disabled"), _T("")) 
-ITEM_MAP_TO(_T("basic_ini_text_mapper")) 
-OPTION(_T("section"), _T("NRPE")) 
-OPTION(_T("key"), _T("allowed_hosts")) 
-OPTION(_T("default"), _T("")) 
-ITEM_END()
-
-PAGE_END()
-MODULE_SETTINGS_END()

trunk/modules/NRPEServer/NRPEServer.def

@@ -11 +11 @@
   NSHandleCommand
   NSUnloadModule
-  NSGetConfigurationMeta
   NSGetModuleDescription
   NSDeleteBuffer

trunk/modules/NRPEServer/NRPEServer.h

@@ -59 +59 @@
 #endif
   }
-  NSCModuleWrapper::module_version getModuleVersion() {
-    NSCModuleWrapper::module_version version = {0, 0, 1 };
+  nscapi::plugin_wrapper::module_version getModuleVersion() {
+    nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;
   }

trunk/modules/NRPEServer/nrpe_handler.cpp

@@ -2 +2 @@
 #include <boost/asio.hpp>
 #include "nrpe_handler.hpp"
-#include <NSCHelper.h>
 
 namespace nrpe {
@@ -9 +8 @@
       strEx::token cmd = strEx::getToken(p.getPayload(), '!');
       if (cmd.first == _T("_NRPE_CHECK")) {
-        return nrpe::packet::create_response(NSCAPI::returnOK, _T("I (") + NSCModuleHelper::getApplicationVersionString() + _T(") seem to be doing fine..."), p.get_payload_length());
+        return nrpe::packet::create_response(NSCAPI::returnOK, _T("I (") + nscapi::plugin_singleton->get_core()->getApplicationVersionString() + _T(") seem to be doing fine..."), p.get_payload_length());
       }
       std::wstring msg, perf;
@@ -34 +33 @@
       NSCAPI::nagiosReturn ret = -3;
       try {
-        ret = NSCModuleHelper::InjectSplitAndCommand(cmd.first, cmd.second, '!', msg, perf);
+        ret = nscapi::plugin_singleton->get_core()->InjectSplitAndCommand(cmd.first, cmd.second, '!', msg, perf);
       } catch (...) {
         return nrpe::packet::create_response(NSCAPI::returnUNKNOWN, _T("UNKNOWN: Internal exception"), p.get_payload_length());

trunk/modules/NRPEServer/stdafx.h

@@ -46 +46 @@
 #include <types.hpp>
 #include <NSCAPI.h>
-#include <NSCHelper.h>
-#include <nsc_module_wrapper.hpp>
+#include <nscapi/plugin.hpp>
 #include <nrpe/nrpe_packet.hpp>
 

trunk/modules/NSCAAgent/NSCAAgent.cpp

@@ -72 +72 @@
 
 
-  } catch (NSCModuleHelper::NSCMHExcpetion &e) {
+  } catch (nscapi::nscapi_exception &e) {
     NSC_LOG_ERROR_STD(_T("Failed to register command: ") + e.msg_);
   } catch (...) {
@@ -124 +124 @@
     socket.recv_iv(password_, encryption_method_, boost::posix_time::seconds(timeout_));
     socket.send_nsca(packet, boost::posix_time::seconds(timeout_));
-    return 1;
+    return NSCAPI::isSuccess;
   } catch (std::exception &e) {
     NSC_LOG_ERROR_STD(_T("Failed to send data: ") + to_wstring(e.what()));
+    return NSCAPI::hasFailed;
   } catch (...) {
     NSC_LOG_ERROR_STD(_T("Failed to send data: UNKNOWN"));
+    return NSCAPI::hasFailed;
   }
 }

trunk/modules/NSCAAgent/NSCAAgent.h

@@ -23 +23 @@
 NSC_WRAPPERS_MAIN();
 
-class NSCAAgent : public NSCModuleHelper::SimpleNotificationHandler {
+class NSCAAgent : public nscapi::impl::SimpleNotificationHandler {
 private:
 
@@ -59 +59 @@
   * @return module version
   */
-  NSCModuleWrapper::module_version getModuleVersion() {
-    NSCModuleWrapper::module_version version = {0, 3, 0 };
+  nscapi::plugin_wrapper::module_version getModuleVersion() {
+    nscapi::plugin_wrapper::module_version version = {0, 3, 0 };
     return version;
   }

trunk/modules/NSCAAgent/stdafx.h

@@ -37 +37 @@
 
 #include <NSCAPI.h>
-#include <NSCHelper.h>
-#include <nsc_module_wrapper.hpp>
+#include <nscapi/plugin.hpp>
 #include <config.h>
 #include <utils.h>

trunk/modules/NSClientListener/NSClientListener.def

@@ -11 +11 @@
   NSHandleCommand
   NSUnloadModule
-  NSGetConfigurationMeta
   NSGetModuleDescription
 

trunk/modules/Scheduler/Scheduler.cpp

@@ -40 +40 @@
 
     SETTINGS_REG_KEY_I(scheduler::THREADS);
-  } catch (NSCModuleHelper::NSCMHExcpetion &e) {
+  } catch (nscapi::nscapi_exception &e) {
     NSC_LOG_ERROR_STD(_T("Failed to register command: ") + e.msg_);
   } catch (...) {
@@ -59 +59 @@
     bool found = false;
     scheduler::target def = read_defaut_schedule(setting_keys::scheduler::DEFAULT_SCHEDULE_SECTION_PATH);
-    std::list<std::wstring> items = NSCModuleHelper::getSettingsSection(setting_keys::scheduler::SCHEDULES_SECTION_PATH);
+    std::list<std::wstring> items = GET_CORE()->getSettingsSection(setting_keys::scheduler::SCHEDULES_SECTION_PATH);
 
     for (std::list<std::wstring>::const_iterator cit = items.begin(); cit != items.end(); ++cit) {
       found = true;
-      add_schedule(*cit, NSCModuleHelper::getSettingsString(setting_keys::scheduler::SCHEDULES_SECTION_PATH, *cit, _T("")), def);
+      add_schedule(*cit, GET_CORE()->getSettingsString(setting_keys::scheduler::SCHEDULES_SECTION_PATH, *cit, _T("")), def);
     }
 
@@ -74 +74 @@
 
     }
-  } catch (NSCModuleHelper::NSCMHExcpetion &e) {
+  } catch (nscapi::nscapi_exception &e) {
     NSC_LOG_ERROR_STD(_T("Exception in module Scheduler: ") + e.msg_);
     return false;
@@ -86 +86 @@
 scheduler::target Scheduler::read_defaut_schedule(std::wstring path) {
   scheduler::target item;
-  item.channel = NSCModuleHelper::getSettingsString(path, setting_keys::scheduler::CHANNEL_D, setting_keys::scheduler::CHANNEL_D_DEFAULT);
-  item.command = NSCModuleHelper::getSettingsString(path, setting_keys::scheduler::COMMAND_D, setting_keys::scheduler::COMMAND_D_DEFAULT);
-  std::wstring report = NSCModuleHelper::getSettingsString(path, setting_keys::scheduler::REPORT_MODE_D, setting_keys::scheduler::REPORT_MODE_D_DEFAULT);
-  item.report = NSCHelper::report::parse(report);
-  std::wstring duration = NSCModuleHelper::getSettingsString(path, setting_keys::scheduler::INTERVAL_D, setting_keys::scheduler::INTERVAL_D_DEFAULT);
+  item.channel = GET_CORE()->getSettingsString(path, setting_keys::scheduler::CHANNEL_D, setting_keys::scheduler::CHANNEL_D_DEFAULT);
+  item.command = GET_CORE()->getSettingsString(path, setting_keys::scheduler::COMMAND_D, setting_keys::scheduler::COMMAND_D_DEFAULT);
+  std::wstring report = GET_CORE()->getSettingsString(path, setting_keys::scheduler::REPORT_MODE_D, setting_keys::scheduler::REPORT_MODE_D_DEFAULT);
+  item.report = nscapi::report::parse(report);
+  std::wstring duration = GET_CORE()->getSettingsString(path, setting_keys::scheduler::INTERVAL_D, setting_keys::scheduler::INTERVAL_D_DEFAULT);
   item.duration = boost::posix_time::seconds(strEx::stoui_as_time_sec(duration, 1));
   return item;
@@ -99 +99 @@
   item.alias = alias;
   item.command = command;
-  item.channel = NSCModuleHelper::getSettingsString(detail_path, setting_keys::scheduler::CHANNEL, def.channel);
-  item.command = NSCModuleHelper::getSettingsString(detail_path, setting_keys::scheduler::COMMAND, item.command);
+  item.channel = GET_CORE()->getSettingsString(detail_path, setting_keys::scheduler::CHANNEL, def.channel);
+  item.command = GET_CORE()->getSettingsString(detail_path, setting_keys::scheduler::COMMAND, item.command);
 
   strEx::parse_command(item.command, item.command, item.arguments);
 
-  std::wstring report = NSCModuleHelper::getSettingsString(detail_path, setting_keys::scheduler::REPORT_MODE, NSCHelper::report::to_string(def.report));
-  item.report = NSCHelper::report::parse(report);
-  std::wstring duration = NSCModuleHelper::getSettingsString(detail_path, setting_keys::scheduler::INTERVAL, to_wstring(def.duration.total_seconds()) + _T("s"));
+  std::wstring report = GET_CORE()->getSettingsString(detail_path, setting_keys::scheduler::REPORT_MODE, nscapi::report::to_string(def.report));
+  item.report = nscapi::report::parse(report);
+  std::wstring duration = GET_CORE()->getSettingsString(detail_path, setting_keys::scheduler::INTERVAL, to_wstring(def.duration.total_seconds()) + _T("s"));
   item.duration = boost::posix_time::seconds(strEx::stoui_as_time_sec(duration, 1));
   scheduler_.add_task(item);
@@ -124 +124 @@
   try {
     std::string response;
-    NSCAPI::nagiosReturn code = NSCModuleHelper::InjectCommand(item.command.c_str(), item.arguments, response);
-    if (NSCHelper::report::matches(item.report, code)) {
-      NSCModuleHelper::NotifyChannel(item.channel, item.alias, code, response);
+    NSCAPI::nagiosReturn code = GET_CORE()->InjectCommand(item.command.c_str(), item.arguments, response);
+    if (nscapi::report::matches(item.report, code)) {
+      GET_CORE()->NotifyChannel(item.channel, item.alias, code, response);
     }
-  } catch (NSCModuleHelper::NSCMHExcpetion &e) {
+  } catch (nscapi::nscapi_exception &e) {
     NSC_LOG_ERROR_STD(_T("Exception handling: ") + item.alias + _T(": ") + e.msg_);
     scheduler_.remove_task(item.id);

trunk/modules/Scheduler/Scheduler.h

@@ -47 +47 @@
     return _T("Scheduler");
   }
-  NSCModuleWrapper::module_version getModuleVersion() {
-    NSCModuleWrapper::module_version version = {0, 3, 0 };
+  nscapi::plugin_wrapper::module_version getModuleVersion() {
+    nscapi::plugin_wrapper::module_version version = {0, 3, 0 };
     return version;
   }

trunk/modules/Scheduler/stdafx.h

@@ -30 +30 @@
 
 #include <NSCAPI.h>
-#include <nsc_module_wrapper.hpp>
-#include <NSCHelper.h>
+#include <nscapi/plugin.hpp>
 

trunk/service/CMakeLists.txt

@@ -19 +19 @@
   settings_manager_impl.cpp
 
-  ${NSCP_DEF_PLUGIN_CPP}
+  ${NSCP_INCLUDE_PATH}/nscapi/nscapi_helper.cpp
 
   ${NSCP_INCLUDE_PATH}/simpleini/ConvertUTF.c
   ${NSCP_INCLUDE_PATH}/b64/b64.c
+  ${NSCP_INCLUDE_PATH}/arrayBuffer.cpp
 
 )
@@ -62 +63 @@
     ${NSCP_INCLUDE_PATH}/service/system_service.hpp
     ${NSCP_INCLUDE_PATH}/service/win32_service.hpp
-
-    ${NSCP_DEF_PLUGIN_HPP}
+    ${NSCP_INCLUDE_PATH}/nscapi/nscapi_helper.hpp
 
   )

trunk/service/NSCPlugin.cpp

@@ -23 +23 @@
 #include "core_api.h"
 
-unsigned int NSCPlugin::last_plugin_id_ = 0;
-
-
 /**
  * Default c-tor
@@ -33 +30 @@
  * @param file The file (DLL) to load as a NSC plug in.
  */
-NSCPlugin::NSCPlugin(const boost::filesystem::wpath file)
+NSCPlugin::NSCPlugin(const unsigned int id, const boost::filesystem::wpath file)
   : module_(file.string())
   ,fLoadModule(NULL)
@@ -43 +40 @@
   ,fDeleteBuffer(NULL)
   ,fGetDescription(NULL)
-  ,fGetConfigurationMeta(NULL)
   ,fGetVersion(NULL)
   ,fCommandLineExec(NULL)
@@ -53 +49 @@
   ,lastIsMsgPlugin_(false)
   ,broken_(false)
-  ,plugin_id_(0)
+  ,plugin_id_(id)
 {
-  plugin_id_ = ++last_plugin_id_;
+
 }
 /*
@@ -67 +63 @@
   ,fHandleMessage(NULL)
   ,fGetDescription(NULL)
-  ,fGetConfigurationMeta(NULL)
   ,fGetVersion(NULL)
   ,fCommandLineExec(NULL)
@@ -361 +356 @@
 
   try {
-    fLoadModule = (lpLoadModule)module_.load_proc("NSLoadModule");
+    fLoadModule = (nscapi::plugin_api::lpLoadModule)module_.load_proc("NSLoadModule");
     if (!fLoadModule)
       throw NSPluginException(module_, _T("Could not load NSLoadModule"));
 
-    fModuleHelperInit = (lpModuleHelperInit)module_.load_proc("NSModuleHelperInit");
+    fModuleHelperInit = (nscapi::plugin_api::lpModuleHelperInit)module_.load_proc("NSModuleHelperInit");
     if (!fModuleHelperInit)
       throw NSPluginException(module_, _T("Could not load NSModuleHelperInit"));
@@ -375 +370 @@
     }
 
-    fGetName = (lpGetName)module_.load_proc("NSGetModuleName");
+    fGetName = (nscapi::plugin_api::lpGetName)module_.load_proc("NSGetModuleName");
     if (!fGetName)
       throw NSPluginException(module_, _T("Could not load NSGetModuleName"));
 
-    fGetVersion = (lpGetVersion)module_.load_proc("NSGetModuleVersion");
+    fGetVersion = (nscapi::plugin_api::lpGetVersion)module_.load_proc("NSGetModuleVersion");
     if (!fGetVersion)
       throw NSPluginException(module_, _T("Could not load NSGetModuleVersion"));
 
-    fGetDescription = (lpGetDescription)module_.load_proc("NSGetModuleDescription");
+    fGetDescription = (nscapi::plugin_api::lpGetDescription)module_.load_proc("NSGetModuleDescription");
     if (!fGetDescription)
       throw NSPluginException(module_, _T("Could not load NSGetModuleDescription"));
 
-    fHasCommandHandler = (lpHasCommandHandler)module_.load_proc("NSHasCommandHandler");
+    fHasCommandHandler = (nscapi::plugin_api::lpHasCommandHandler)module_.load_proc("NSHasCommandHandler");
     if (!fHasCommandHandler)
       throw NSPluginException(module_, _T("Could not load NSHasCommandHandler"));
 
-    fHasMessageHandler = (lpHasMessageHandler)module_.load_proc("NSHasMessageHandler");
+    fHasMessageHandler = (nscapi::plugin_api::lpHasMessageHandler)module_.load_proc("NSHasMessageHandler");
     if (!fHasMessageHandler)
       throw NSPluginException(module_, _T("Could not load NSHasMessageHandler"));
 
-    fHandleCommand = (lpHandleCommand)module_.load_proc("NSHandleCommand");
+    fHandleCommand = (nscapi::plugin_api::lpHandleCommand)module_.load_proc("NSHandleCommand");
     //if (!fHandleCommand)
     //  throw NSPluginException(module_, _T("Could not load NSHandleCommand"));
 
-    fDeleteBuffer = (lpDeleteBuffer)module_.load_proc("NSDeleteBuffer");
+    fDeleteBuffer = (nscapi::plugin_api::lpDeleteBuffer)module_.load_proc("NSDeleteBuffer");
     if (!fDeleteBuffer)
       throw NSPluginException(module_, _T("Could not load NSDeleteBuffer"));
 
-    fHandleMessage = (lpHandleMessage)module_.load_proc("NSHandleMessage");
+    fHandleMessage = (nscapi::plugin_api::lpHandleMessage)module_.load_proc("NSHandleMessage");
     if (!fHandleMessage)
       throw NSPluginException(module_, _T("Could not load NSHandleMessage"));
 
-    fUnLoadModule = (lpUnLoadModule)module_.load_proc("NSUnloadModule");
+    fUnLoadModule = (nscapi::plugin_api::lpUnLoadModule)module_.load_proc("NSUnloadModule");
     if (!fUnLoadModule)
       throw NSPluginException(module_, _T("Could not load NSUnloadModule"));
 
-    fGetConfigurationMeta = (lpGetConfigurationMeta)module_.load_proc("NSGetConfigurationMeta");
-    fCommandLineExec = (lpCommandLineExec)module_.load_proc("NSCommandLineExec");
-    fHandleNotification = (lpHandleNotification)module_.load_proc("NSHandleNotification");
-    fHasNotificationHandler = (lpHasNotificationHandler)module_.load_proc("NSHasNotificationHandler");
+    fCommandLineExec = (nscapi::plugin_api::lpCommandLineExec)module_.load_proc("NSCommandLineExec");
+    fHandleNotification = (nscapi::plugin_api::lpHandleNotification)module_.load_proc("NSHandleNotification");
+    fHasNotificationHandler = (nscapi::plugin_api::lpHasNotificationHandler)module_.load_proc("NSHasNotificationHandler");
     
-    fShowTray = (lpShowTray)module_.load_proc("ShowIcon");
-    fHideTray = (lpHideTray)module_.load_proc("HideIcon");
+    fShowTray = (nscapi::plugin_api::lpShowTray)module_.load_proc("ShowIcon");
+    fHideTray = (nscapi::plugin_api::lpHideTray)module_.load_proc("HideIcon");
     
   } catch (NSPluginException &e) {
@@ -430 +424 @@
 
 
-std::wstring NSCPlugin::getCongifurationMeta() 
-{
-  wchar_t *buffer = new wchar_t[4097];
-  if (!getConfigurationMeta_(buffer, 4096)) {
-    throw NSPluginException(module_, _T("Could not get metadata"));
-  }
-  std::wstring ret = buffer;
-  delete [] buffer;
-  return ret;
-}
-bool NSCPlugin::getConfigurationMeta_(wchar_t* buf, unsigned int buflen) {
-  if (fGetConfigurationMeta == NULL)
-    throw NSPluginException(module_, _T("Critical error (getCongifurationMeta)"));
-  try {
-    return fGetConfigurationMeta(buflen, buf)?true:false;
-  } catch (...) {
-    throw NSPluginException(module_, _T("Unhandled exception in getConfigurationMeta."));
-  }
-}
-
 int NSCPlugin::commandLineExec(const unsigned int argLen, wchar_t **arguments) {
   if (fCommandLineExec== NULL)
@@ -459 +433 @@
   }
 }
+

trunk/service/NSCPlugin.h

@@ -25 +25 @@
 #include <sstream>
 #include <dll/dll.hpp>
+#include <boost/noncopyable.hpp>
 
 /**
@@ -103 +104 @@
  *
  */
-class NSCPlugin {
+class NSCPlugin : boost::noncopyable {
 private:
   bool bLoaded_;      // Status of plug in
   dll::dll module_;
   bool broken_;
-  static unsigned int last_plugin_id_;
   unsigned int plugin_id_;
 
-  typedef int (*lpModuleHelperInit)(unsigned int, 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 char*,const unsigned int,char**,unsigned int*);
-  typedef int (*lpDeleteBuffer)(char**);
-  typedef int (*lpCommandLineExec)(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)();
-  typedef int (*lpHasNotificationHandler)();
-  typedef int (*lpHandleNotification)(const wchar_t *channel, const wchar_t* command, NSCAPI::nagiosReturn code, char* result, unsigned int result_len);
-
-
-  lpModuleHelperInit fModuleHelperInit;
-  lpLoadModule fLoadModule;
-  lpGetName fGetName;
-  lpGetVersion fGetVersion;
-  lpGetDescription fGetDescription;
-  lpHasCommandHandler fHasCommandHandler;
-  lpHasMessageHandler fHasMessageHandler;
-  lpHandleCommand fHandleCommand;
-  lpDeleteBuffer fDeleteBuffer;
-  lpHandleMessage fHandleMessage;
-  lpUnLoadModule fUnLoadModule;
-  lpGetConfigurationMeta fGetConfigurationMeta;
-  lpCommandLineExec fCommandLineExec;
-  lpShowTray fShowTray;
-  lpHideTray fHideTray;
-  lpHasNotificationHandler fHasNotificationHandler;
-  lpHandleNotification fHandleNotification;
+  nscapi::plugin_api::lpModuleHelperInit fModuleHelperInit;
+  nscapi::plugin_api::lpLoadModule fLoadModule;
+  nscapi::plugin_api::lpGetName fGetName;
+  nscapi::plugin_api::lpGetVersion fGetVersion;
+  nscapi::plugin_api::lpGetDescription fGetDescription;
+  nscapi::plugin_api::lpHasCommandHandler fHasCommandHandler;
+  nscapi::plugin_api::lpHasMessageHandler fHasMessageHandler;
+  nscapi::plugin_api::lpHandleCommand fHandleCommand;
+  nscapi::plugin_api::lpDeleteBuffer fDeleteBuffer;
+  nscapi::plugin_api::lpHandleMessage fHandleMessage;
+  nscapi::plugin_api::lpUnLoadModule fUnLoadModule;
+  nscapi::plugin_api::lpCommandLineExec fCommandLineExec;
+  nscapi::plugin_api::lpShowTray fShowTray;
+  nscapi::plugin_api::lpHideTray fHideTray;
+  nscapi::plugin_api::lpHasNotificationHandler fHasNotificationHandler;
+  nscapi::plugin_api::lpHandleNotification fHandleNotification;
 
 public:
-  NSCPlugin(const boost::filesystem::wpath file);
-  NSCPlugin(NSCPlugin &other);
+  NSCPlugin(const unsigned int id, const boost::filesystem::wpath file);
+  //NSCPlugin(NSCPlugin &other);
   virtual ~NSCPlugin(void);
 
@@ -192 +172 @@
     return file;
   }
+  static std::wstring get_plugin_file(std::wstring key) {
+#ifdef WIN32
+    return key + _T(".dll");
+#else
+    return _T("lib") + key + _T(".so");
+#endif
+  }
   bool getLastIsMsgPlugin() {
     return lastIsMsgPlugin_;
@@ -205 +192 @@
   bool getDescription_(wchar_t* buf, unsigned int buflen);
   void loadRemoteProcs_(void);
-  bool getConfigurationMeta_(wchar_t* buf, unsigned int buflen);
 };
 

trunk/service/NSClient++.cpp

@@ -35 +35 @@
 #include "settings_manager_impl.h"
 #include <settings/macros.h>
-#include <NSCHelper.h>
 #include "simple_client.hpp"
 #include "settings_client.hpp"
 #include "service_manager.hpp"
+#include <nscapi/nscapi_helper.hpp>
 
 #include "../libs/protobuf/plugin.proto.h"
@@ -304 +304 @@
     } else if ( wcscasecmp( _T("about"), argv[1]+1 ) == 0 ) {
       try {
+        unsigned int next_plugin_id = 0;
         g_bConsoleLog = true;
         LOG_MESSAGE(SZAPPNAME _T(" (C) Michael Medin - michael<at>medin<dot>name"));
@@ -318 +319 @@
             LOG_MESSAGE_STD(_T("Found: ") + file);
             if (is_module(pluginPath / file)) {
-              NSCPlugin *plugin = new NSCPlugin(pluginPath / file);
+              NSCPlugin *plugin = new NSCPlugin(next_plugin_id++, pluginPath / file);
               std::wstring name = _T("<unknown>");
               std::wstring description = _T("<unknown>");
@@ -459 +460 @@
         try {
           LOG_DEBUG_STD(_T("Attempting to fake load: ") + file.string());
-          NSCPlugin plugin(pluginPath / file);
+          NSCPlugin plugin(next_plugin_id_++, pluginPath / file);
           plugin.load_dll();
           plugin.load_plugin(NSCAPI::dontStart);
@@ -490 +491 @@
             try {
               LOG_DEBUG_STD(_T("Attempting to fake load: ") + file.string());
-              NSCPlugin plugin(modPath / file);
+              NSCPlugin plugin(next_plugin_id_++, modPath / file);
               plugin.load_dll();
               plugin.load_plugin(mode);
@@ -504 +505 @@
           std::wstring name = file.string();
           try {
-            NSCPlugin plugin(modPath / file);
+            NSCPlugin plugin(next_plugin_id_++, modPath / file);
             name = plugin.getModule();
             plugin.load_dll();
@@ -626 +627 @@
       Settings::string_list list = settings_manager::get_settings()->get_keys(MAIN_MODULES_SECTION);
       for (Settings::string_list::const_iterator cit = list.begin(); cit != list.end(); ++cit) {
-        LOG_DEBUG_STD(_T("Processing plugin: " + *cit));
+        std::wstring file = NSCPlugin::get_plugin_file(*cit);
+        LOG_DEBUG_STD(_T("Processing plugin: " + *cit) + _T(" in ") + file);
         try {
           if (settings_manager::get_settings()->get_string(MAIN_MODULES_SECTION, *cit) == _T("disabled")) {
-            LOG_DEBUG_STD(_T("Not booting: ") + *cit + _T(" since it is disabled."));
+            LOG_DEBUG_STD(_T("Not booting: ") + file + _T(" since it is disabled."));
             continue;
           }
@@ -636 +638 @@
         }
         try {
-          loadPlugin(getBasePath() / boost::filesystem::wpath(_T("modules")) / boost::filesystem::wpath(*cit));
+          loadPlugin(getBasePath() / boost::filesystem::wpath(_T("modules")) / boost::filesystem::wpath(file));
         } catch(const NSPluginException& e) {
           LOG_ERROR_CORE_STD(_T("Exception raised: '") + e.error_ + _T("' in module: ") + e.file_);
           //return false;
         } catch (std::exception e) {
-          LOG_ERROR_CORE_STD(_T("exception loading plugin: ") + (*cit) + strEx::string_to_wstring(e.what()));
+          LOG_ERROR_CORE_STD(_T("exception loading plugin: ") + file + strEx::string_to_wstring(e.what()));
           return false;
         } catch (...) {
-          LOG_ERROR_CORE_STD(_T("Unknown exception loading plugin: ") + (*cit));
+          LOG_ERROR_CORE_STD(_T("Unknown exception loading plugin: ") + file);
           return false;
         }
@@ -971 +973 @@
  */
 NSClientT::plugin_type NSClientT::loadPlugin(const boost::filesystem::wpath file) {
-  plugin_type plugin(new NSCPlugin(file));
+  plugin_type plugin(new NSCPlugin(next_plugin_id_++, file));
   return addPlugin(plugin);
 }
@@ -1122 +1124 @@
       }
       NSCAPI::nagiosReturn c = plugin->handleCommand(command, request, response);
-      LOG_DEBUG_STD(_T("Result ") + std::wstring(command) + _T(": ") + NSCHelper::translateReturn(c) + _T(" {{{") + strEx::strip_hex(to_wstring(response)) + _T("}}}"));
+      LOG_DEBUG_STD(_T("Result ") + std::wstring(command) + _T(": ") + nscapi::plugin_helper::translateReturn(c) + _T(" {{{") + strEx::strip_hex(to_wstring(response)) + _T("}}}"));
       return c;
     } catch (nsclient::commands::command_exception &e) {
@@ -1201 +1203 @@
   OutputDebugString(msg.c_str());
 #else
-  std::wcout << _T("--BROKEN MESSAGE: ") << msg << _T("--") << std::endl;
+//  std::wcout << _T("--BROKEN MESSAGE: ") << msg << _T("--") << std::endl;
 #endif
 }

trunk/service/NSClient++.h

@@ -123 +123 @@
   nsclient::commands commands_;
   nsclient::channels channels_;
+  unsigned int next_plugin_id_;
 
 
 public:
   // c-tor, d-tor
-  NSClientT(void) : debug_(log_unknown), plugins_loaded_(false), enable_shared_session_(false), commands_(this), channels_(this) {}
+  NSClientT(void) : debug_(log_unknown), plugins_loaded_(false), enable_shared_session_(false), commands_(this), channels_(this), next_plugin_id_(0) {}
   virtual ~NSClientT(void) {}
   void enableDebug(bool debug = true) {

trunk/service/commands.hpp

@@ -5 +5 @@
 #include "NSCPlugin.h"
 #include "logger.hpp"
+#include <strEx.h>
 
 namespace nsclient {
@@ -40 +41 @@
 
     void add_plugin(plugin_type plugin) {
-      if (!plugin || !plugin->hasCommandHandler())
+      if (!plugin || !plugin->hasCommandHandler()) {
         return;
+      }
       plugins_[plugin->get_id()] = plugin;
       
@@ -88 +90 @@
       std::wstring lc = make_key(cmd);
       if (!have_plugin(plugin_id))
-        throw command_exception("Failed to find plugin: " + ::to_string(plugin_id));
+        throw command_exception("Failed to find plugin: " + ::to_string(plugin_id) + ": " + unsafe_get_all_plugin_ids());
       descriptions_[lc] = desc;
       commands_[lc] = plugins_[plugin_id];
     }
+private:
 
+    std::string unsafe_get_all_plugin_ids() {
+      std::string ret;
+      std::pair<unsigned long,plugin_type> cit;
+      BOOST_FOREACH(cit, plugins_) {
+        ret += ::to_string(cit.first) + ", ";
+        //lst.push_back(::to_wstring(cit.first) + _T("=") + cit.second->getName());
+        //lst.push_back(::to_wstring(cit.first));
+      }
+      return ret;
+    }
+
+
+public:
     std::wstring describe(std::wstring command) {
       boost::shared_lock<boost::shared_mutex> readLock(mutex_, boost::get_system_time() + boost::posix_time::seconds(5));
@@ -120 +136 @@
     }
 
+    std::list<std::wstring> list_plugins() {
+      std::list<std::wstring> lst;
+      boost::shared_lock<boost::shared_mutex> readLock(mutex_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!readLock.owns_lock()) {
+        log_error(__FILEW__, __LINE__, _T("Failed to get mutex"));
+        return lst;
+      }
+      std::pair<unsigned long,plugin_type> cit;
+      BOOST_FOREACH(cit, plugins_) {
+        //lst.push_back(::to_wstring(cit.first) + _T("=") + cit.second->getName());
+        lst.push_back(::to_wstring(cit.first));
+      }
+      return lst;
+    }
+
     plugin_type get(std::wstring command) {
       boost::shared_lock<boost::shared_mutex> readLock(mutex_, boost::get_system_time() + boost::posix_time::seconds(5));
@@ -136 +167 @@
 
     std::wstring to_wstring() {
-      std::wstring ret;
+      std::wstring ret = _T("commands {");
       BOOST_FOREACH(std::wstring str, list()) {
         if (!ret.empty()) ret += _T(", ");
         ret += str;
       }
+      ret += _T("}, plugins {");
+      BOOST_FOREACH(std::wstring str, list_plugins()) {
+        if (!ret.empty()) ret += _T(", ");
+        ret += str;
+      }
+      ret += _T("}");
       return ret;
     }

trunk/service/core_api.cpp

@@ -19 +19 @@
 #include <config.h>
 #include <msvc_wrappers.h>
+#include <arrayBuffer.h>
 //#include <settings/settings_ini.hpp>
 //#include <settings/settings_registry.hpp>
@@ -28 +29 @@
 #include "settings_manager_impl.h"
 #include <b64/b64.h>
-#include <NSCHelper.h>
+#include <nscapi/nscapi_helper.hpp>
 #ifdef _WIN32
 #include <ServiceCmd.h>
@@ -34 +35 @@
 
 #define LOG_ERROR_STD(msg) LOG_ERROR(((std::wstring)msg).c_str())
-#define LOG_ERROR(msg) \
-  NSAPIMessage(NSCAPI::error, __FILEW__, __LINE__, msg)
-
+#define LOG_ERROR(msg) LOG_ANY(msg, NSCAPI::error)
 #define LOG_CRITICAL_STD(msg) LOG_CRITICAL(((std::wstring)msg).c_str())
-#define LOG_CRITICAL(msg) \
-  NSAPIMessage(NSCAPI::critical, __FILEW__, __LINE__, msg)
+#define LOG_CRITICAL(msg) LOG_ANY(msg, NSCAPI::critical)
 #define LOG_MESSAGE_STD(msg) LOG_MESSAGE(((std::wstring)msg).c_str())
-#define LOG_MESSAGE(msg) \
-  NSAPIMessage(NSCAPI::log, __FILEW__, __LINE__, msg)
-
+#define LOG_MESSAGE(msg) LOG_ANY(msg, NSCAPI::log)
 #define LOG_DEBUG_STD(msg) LOG_DEBUG(((std::wstring)msg).c_str())
-#define LOG_DEBUG(msg) \
-  NSAPIMessage(NSCAPI::debug, __FILEW__, __LINE__, msg)
-
+#define LOG_DEBUG(msg) LOG_ANY(msg, NSCAPI::debug)
+
+#define LOG_ANY(msg, type) NSAPIMessage(type, __FILEW__, __LINE__, msg)
 
 NSCAPI::errorReturn NSAPIGetSettingsString(const wchar_t* section, const wchar_t* key, const wchar_t* defaultValue, wchar_t* buffer, unsigned int bufLen) {
   try {
-    return NSCHelper::wrapReturnString(buffer, bufLen, settings_manager::get_settings()->get_string(section, key, defaultValue), NSCAPI::isSuccess);
+    return nscapi::plugin_helper::wrapReturnString(buffer, bufLen, settings_manager::get_settings()->get_string(section, key, defaultValue), NSCAPI::isSuccess);
   } catch (...) {
     LOG_ERROR_STD(_T("Failed to getString: ") + key);
@@ -66 +62 @@
 }
 NSCAPI::errorReturn NSAPIGetBasePath(wchar_t*buffer, unsigned int bufLen) {
-  return NSCHelper::wrapReturnString(buffer, bufLen, mainClient.getBasePath().string(), NSCAPI::isSuccess);
+  return nscapi::plugin_helper::wrapReturnString(buffer, bufLen, mainClient.getBasePath().string(), NSCAPI::isSuccess);
 }
 NSCAPI::errorReturn NSAPIGetApplicationName(wchar_t*buffer, unsigned int bufLen) {
-  return NSCHelper::wrapReturnString(buffer, bufLen, SZAPPNAME, NSCAPI::isSuccess);
+  return nscapi::plugin_helper::wrapReturnString(buffer, bufLen, SZAPPNAME, NSCAPI::isSuccess);
 }
 NSCAPI::errorReturn NSAPIGetApplicationVersionStr(wchar_t*buffer, unsigned int bufLen) {
-  return NSCHelper::wrapReturnString(buffer, bufLen, SZVERSION, NSCAPI::isSuccess);
+  return nscapi::plugin_helper::wrapReturnString(buffer, bufLen, SZVERSION, NSCAPI::isSuccess);
 }
 void NSAPIMessage(int msgType, const wchar_t* file, const int line, const wchar_t* message) {
@@ -262 +258 @@
 }
 NSCAPI::errorReturn NSAPIDescribeCommand(const wchar_t* command, wchar_t* buffer, unsigned int bufLen) {
-  return NSCHelper::wrapReturnString(buffer, bufLen, mainClient.describeCommand(command), NSCAPI::isSuccess);
+  return nscapi::plugin_helper::wrapReturnString(buffer, bufLen, mainClient.describeCommand(command), NSCAPI::isSuccess);
 }
 NSCAPI::errorReturn NSAPIGetAllCommandNames(arrayBuffer::arrayBuffer* aBuffer, unsigned int *bufLen) {
@@ -369 +365 @@
 
 
-LPVOID NSAPILoader(wchar_t*buffer) {
+LPVOID NSAPILoader(const wchar_t*buffer) {
   if (wcscasecmp(buffer, _T("NSAPIGetApplicationName")) == 0)
     return reinterpret_cast<LPVOID>(&NSAPIGetApplicationName);

trunk/service/core_api.h

@@ -30 +30 @@
 //
 
-LPVOID NSAPILoader(wchar_t*buffer);
+LPVOID NSAPILoader(const wchar_t*buffer);
 NSCAPI::errorReturn NSAPIGetApplicationName(wchar_t*buffer, unsigned int bufLen);
 NSCAPI::errorReturn NSAPIGetBasePath(wchar_t*buffer, unsigned int bufLen);

trunk/service/simple_client.hpp

@@ -1 +1 @@
 #pragma once
+#include <nscapi/nscapi_helper.hpp>
 
 class NSClientT;
@@ -25 +26 @@
 */
       std::wstring s = _T("");
-      std::wstring buff = _T("");
+
       while (true) {
-        std::wcin >> s;
+        std::wstring s;
+        std::getline(std::wcin, s);
         if (s == _T("exit")) {
           std::wcout << _T("Exiting...") << std::endl;
@@ -40 +42 @@
             std::wcout << *cit << _T(": ") << core_->describeCommand(*cit) << std::endl;
           std::wcout << _T("Listing commands...Done") << std::endl;
-        } else if (s == _T("off") && buff == _T("debug ")) {
+        } else if (s == _T("debug off")) {
           std::wcout << _T("Setting debug log off...") << std::endl;
           core_->enableDebug(false);
-        } else if (s == _T("on") && buff == _T("debug ")) {
+        } else if (s == _T("debug on")) {
           std::wcout << _T("Setting debug log on...") << std::endl;
           core_->enableDebug(true);
@@ -51 +53 @@
         } else if (s == _T("assert")) {
           throw "test";
-        } else if (std::cin.peek() < 15) {
-          buff += s;
-          strEx::token t = strEx::getToken(buff, ' ');
+        } else {
+          strEx::token t = strEx::getToken(s, ' ');
           std::wstring msg, perf;
           NSCAPI::nagiosReturn ret = core_->inject(t.first, t.second, msg, perf);
@@ -59 +60 @@
             std::wcout << _T("No handler for command: ") << t.first << std::endl;
           } else {
-            std::wcout << NSCHelper::translateReturn(ret) << _T(":");
-            std::cout << strEx::wstring_to_string(msg);
+            std::wcout << nscapi::plugin_helper::translateReturn(ret) << _T(":");
+            std::wcout << msg;
             if (!perf.empty())
               std::cout << "|" << strEx::wstring_to_string(perf);
             std::wcout << std::endl;
           }
-          buff = _T("");
-        } else {
-          buff += s + _T(" ");
         }
       }