Changeset 81e420c in nscp

Timestamp:

09/01/11 07:05:41 (21 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

3b11e65

Parents:

1307e3f5

Message:

• Added support for loading same plugin twice (in different sessions)
• Added preliminary support for routing passive checks

Files:

• changelog (modified) (1 diff)
• include/NSCAPI.h (modified) (2 diffs)
• include/nscapi/functions.hpp (modified) (7 diffs)
• include/nscapi/macros.hpp (modified) (15 diffs)
• include/nscapi/nscapi_plugin_wrapper.cpp (modified) (1 diff)
• include/nscapi/nscapi_plugin_wrapper.hpp (modified) (2 diffs)
• libs/protobuf/plugin.proto (modified) (8 diffs)
• modules/CheckDisk/CheckDisk.cpp (modified) (2 diffs)
• modules/CheckDisk/CheckDisk.h (modified) (1 diff)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (2 diffs)
• modules/CheckEventLog/CheckEventLog.h (modified) (2 diffs)
• modules/CheckExternalScripts/CheckExternalScripts.cpp (modified) (2 diffs)
• modules/CheckExternalScripts/CheckExternalScripts.h (modified) (1 diff)
• modules/CheckHelpers/CheckHelpers.cpp (modified) (2 diffs)
• modules/CheckHelpers/CheckHelpers.h (modified) (1 diff)
• modules/CheckNSCP/CheckNSCP.cpp (modified) (2 diffs)
• modules/CheckNSCP/CheckNSCP.h (modified) (1 diff)
• modules/CheckSystem/CheckSystem.cpp (modified) (2 diffs)
• modules/CheckSystem/CheckSystem.h (modified) (2 diffs)
• modules/CheckTaskSched/CheckTaskSched.cpp (modified) (2 diffs)
• modules/CheckTaskSched/CheckTaskSched.h (modified) (1 diff)
• modules/CheckTaskSched2/CheckTaskSched2.cpp (modified) (2 diffs)
• modules/CheckTaskSched2/CheckTaskSched2.h (modified) (1 diff)
• modules/CheckWMI/CheckWMI.cpp (modified) (2 diffs)
• modules/CheckWMI/CheckWMI.h (modified) (1 diff)
• modules/FileLogger/FileLogger.cpp (modified) (2 diffs)
• modules/FileLogger/FileLogger.h (modified) (1 diff)
• modules/LUAScript/LUAScript.cpp (modified) (2 diffs)
• modules/LUAScript/LUAScript.h (modified) (1 diff)
• modules/NRPEClient/NRPEClient.cpp (modified) (2 diffs)
• modules/NRPEClient/NRPEClient.h (modified) (2 diffs)
• modules/NRPEServer/NRPEServer.cpp (modified) (2 diffs)
• modules/NRPEServer/NRPEServer.h (modified) (2 diffs)
• modules/NSCAAgent/NSCAAgent.cpp (modified) (2 diffs)
• modules/NSCAAgent/NSCAAgent.h (modified) (2 diffs)
• modules/NSCPClient/NSCPClient.cpp (modified) (2 diffs)
• modules/NSCPClient/NSCPClient.h (modified) (2 diffs)
• modules/NSCPServer/NSCPServer.cpp (modified) (2 diffs)
• modules/NSCPServer/NSCPServer.h (modified) (2 diffs)
• modules/NSClientServer/NSClientServer.cpp (modified) (2 diffs)
• modules/NSClientServer/NSClientServer.h (modified) (1 diff)
• modules/PythonScript/PythonScript.cpp (modified) (4 diffs)
• modules/PythonScript/PythonScript.h (modified) (1 diff)
• modules/PythonScript/script_wrapper.cpp (modified) (2 diffs)
• modules/PythonScript/script_wrapper.hpp (modified) (1 diff)
• modules/Scheduler/Scheduler.cpp (modified) (2 diffs)
• modules/Scheduler/Scheduler.h (modified) (1 diff)
• scripts/python/test.py (modified) (3 diffs)
• service/CMakeLists.txt (modified) (1 diff)
• service/NSCPlugin.cpp (modified) (13 diffs)
• service/NSCPlugin.h (modified) (3 diffs)
• service/NSClient++.cpp (modified) (4 diffs)
• service/NSClient++.h (modified) (4 diffs)
• service/channels.hpp (modified) (1 diff)
• service/core_api.cpp (modified) (1 diff)
• service/core_api.h (modified) (1 diff)
• service/logger.hpp (modified) (2 diffs)
• service/plugin_list.hpp (added)
• service/routers.hpp (added)

changelog

@@ -5 +5 @@
  * Fixa dependonservice LanManWorkStation (old win)
  * Fix RtlStringFromGUID problem on NT4
+
+2011-08-31 MickeM
+ * Added support for loading same plugin twice (in different sessions)
+ * Added preliminary support for routing passive checks
 
 2011-08-30 MickeM

include/NSCAPI.h

@@ -74 +74 @@
   const int key_integer = 200;
   const int key_bool = 300;
+
+  const int message_processed = 0x01;
+  const int message_routed  = 0x02;
+  const int message_ignored = 0x04;
+  const int message_digested  = 0x08;
+  const int message_modified  = 0x10;
 
   typedef int nagiosReturn;
@@ -168 +174 @@
 
   namespace plugin_api {
-    typedef int (*lpModuleHelperInit)(unsigned int, ::nscapi::core_api::lpNSAPILoader f);
-    typedef int (*lpLoadModule)(const wchar_t*,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 wchar_t*,const char*,const unsigned int,char**,unsigned int*);
-    typedef int (*lpHandleMessage)(const char*);
-    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);
+    typedef NSCAPI::errorReturn (*lpGetName)(wchar_t*,unsigned int);
+    typedef NSCAPI::errorReturn (*lpGetDescription)(wchar_t*,unsigned int);
+    typedef NSCAPI::errorReturn (*lpModuleHelperInit)(unsigned int, ::nscapi::core_api::lpNSAPILoader f);
+    typedef NSCAPI::errorReturn (*lpGetVersion)(int* major, int* minor, int* revision);
+    typedef NSCAPI::errorReturn (*lpDeleteBuffer)(char** buffer);
+
+    typedef NSCAPI::errorReturn (*lpLoadModule)(unsigned int plugin_id, const wchar_t* alias, int mode);
+    typedef NSCAPI::errorReturn (*lpUnLoadModule)(unsigned int plugin_id);
+
+    typedef NSCAPI::errorReturn (*lpHasCommandHandler)(unsigned int plugin_id);
+    typedef NSCAPI::errorReturn (*lpHandleCommand)(unsigned int plugin_id, const wchar_t* command, const char* in_buffer, const unsigned int in_buffer_len, char** out_buffer, unsigned int* out_buffer_len);
+
+    typedef NSCAPI::errorReturn (*lpHasMessageHandler)(unsigned int plugin_id);
+    typedef NSCAPI::errorReturn (*lpHandleMessage)(unsigned int plugin_id, const char* buffer, const unsigned int buffer_len);
+
+    typedef NSCAPI::errorReturn (*lpHasNotificationHandler)(unsigned int plugin_id);
+    typedef NSCAPI::errorReturn (*lpHandleNotification)(unsigned int plugin_id, const wchar_t *channel, const wchar_t* command, const char* buffer, unsigned int buffer_len);
+
+    typedef NSCAPI::errorReturn (*lpHasRoutingHandler)(unsigned int plugin_id);
+    typedef NSCAPI::errorReturn (*lpRouteMessage)(unsigned int plugin_id, const wchar_t *channel, const wchar_t* command, const char* buffer, unsigned int buffer_len, wchar_t **new_channel_buffer, char **new_buffer, unsigned int *new_buffer_len);
+
+    typedef NSCAPI::errorReturn (*lpCommandLineExec)(unsigned int plugin_id, const wchar_t* command, const char* in_buffer ,const unsigned int in_buffer_len, char** out_buffer, unsigned int* out_buffer_len);
   }
 }

include/nscapi/functions.hpp

@@ -105 +105 @@
 
 
-    static void create_simple_header(Plugin::Common::Header* hdr, Plugin::Common_Header_Type type)  {
-      hdr->set_type(type);
+    static void create_simple_header(Plugin::Common::Header* hdr)  {
       hdr->set_version(Plugin::Common_Version_VERSION_1);
       hdr->set_max_supported_version(Plugin::Common_Version_VERSION_1);
@@ -117 +116 @@
     static void create_simple_query_request(std::wstring command, std::vector<std::wstring> arguments, std::string &buffer) {
       Plugin::QueryRequestMessage message;
-      create_simple_header(message.mutable_header(), Plugin::Common_Header_Type_QUERY_REQUEST);
+      create_simple_header(message.mutable_header());
 
       Plugin::QueryRequestMessage::Request *payload = message.add_payload();
@@ -129 +128 @@
     static void create_simple_query_request(std::wstring command, std::list<std::wstring> arguments, std::string &buffer) {
       Plugin::QueryRequestMessage message;
-      create_simple_header(message.mutable_header(), Plugin::Common_Header_Type_QUERY_REQUEST);
+      create_simple_header(message.mutable_header());
 
       Plugin::QueryRequestMessage::Request *payload = message.add_payload();
@@ -146 +145 @@
     static void create_simple_query_response(std::wstring command, NSCAPI::nagiosReturn ret, std::wstring msg, std::wstring perf, std::string &buffer) {
       Plugin::QueryResponseMessage message;
-      create_simple_header(message.mutable_header(), Plugin::Common_Header_Type_QUERY_RESPONSE);
+      create_simple_header(message.mutable_header());
 
       Plugin::QueryResponseMessage::Response *payload = message.add_payload();
@@ -197 +196 @@
       
       Plugin::ExecuteRequestMessage message;
-      create_simple_header(message.mutable_header(), Plugin::Common_Header_Type_EXEC_REQUEST);
+      create_simple_header(message.mutable_header());
 
       Plugin::ExecuteRequestMessage::Request *payload = message.add_payload();
@@ -210 +209 @@
 
       Plugin::ExecuteRequestMessage message;
-      create_simple_header(message.mutable_header(), Plugin::Common_Header_Type_EXEC_REQUEST);
+      create_simple_header(message.mutable_header());
 
       Plugin::ExecuteRequestMessage::Request *payload = message.add_payload();
@@ -231 +230 @@
     static void create_simple_exec_response(std::wstring command, NSCAPI::nagiosReturn ret, std::wstring result, std::string &response) {
       Plugin::ExecuteResponseMessage message;
-      create_simple_header(message.mutable_header(), Plugin::Common_Header_Type_EXEC_RESPONSE);
+      create_simple_header(message.mutable_header());
 
       Plugin::ExecuteResponseMessage::Response *payload = message.add_payload();

include/nscapi/macros.hpp

@@ -1 +1 @@
 #pragma once
 #include <unicode_char.hpp>
+#include <boost/shared_ptr.hpp>
+#include <map>
 
 //////////////////////////////////////////////////////////////////////////
@@ -7 +9 @@
   extern "C" int NSModuleHelperInit(unsigned int id, nscapi::core_api::lpNSAPILoader f); \
   extern "C" int NSLoadModule(); \
-  extern "C" int NSLoadModuleEx(wchar_t* alias, int mode); \
+  extern "C" int NSLoadModuleEx(unsigned int plugin_id, wchar_t* alias, int mode); \
   extern "C" void NSDeleteBuffer(char**buffer); \
   extern "C" int NSGetModuleName(wchar_t* buf, int buflen); \
   extern "C" int NSGetModuleDescription(wchar_t* buf, int buflen); \
   extern "C" int NSGetModuleVersion(int *major, int *minor, int *revision); \
-  extern "C" NSCAPI::boolReturn NSHasCommandHandler(); \
-  extern "C" NSCAPI::boolReturn NSHasMessageHandler(); \
-  extern "C" void NSHandleMessage(const char* data); \
-  extern "C" NSCAPI::nagiosReturn NSHandleCommand(const wchar_t* command, const char* request_buffer, const unsigned int request_buffer_len, char** reply_buffer, unsigned int *reply_buffer_len); \
-  extern "C" int NSUnloadModule();
+  extern "C" NSCAPI::boolReturn NSHasCommandHandler(unsigned int plugin_id); \
+  extern "C" NSCAPI::boolReturn NSHasMessageHandler(unsigned int plugin_id); \
+  extern "C" void NSHandleMessage(unsigned int plugin_id, const char* data, unsigned int len); \
+  extern "C" NSCAPI::nagiosReturn NSHandleCommand(unsigned int plugin_id, const wchar_t* command, const char* request_buffer, const unsigned int request_buffer_len, char** reply_buffer, unsigned int *reply_buffer_len); \
+  extern "C" int NSUnloadModule(unsigned int plugin_id);
 
 
 #define NSC_WRAPPERS_CLI() \
-  extern "C" int NSCommandLineExec(wchar_t *command, char *request_buffer, unsigned int request_len, char **response_buffer, unsigned int *response_len);
+  extern "C" int NSCommandLineExec(unsigned int plugin_id, wchar_t *command, char *request_buffer, unsigned int request_len, char **response_buffer, unsigned int *response_len);
 
 #define NSC_WRAPPERS_CHANNELS() \
-  extern "C" int NSHasNotificationHandler(); \
-  extern "C" int NSHandleNotification(const wchar_t*, const wchar_t*, NSCAPI::nagiosReturn, const char*, unsigned int);
+  extern "C" int NSHasNotificationHandler(unsigned int plugin_id); \
+  extern "C" int NSHandleNotification(unsigned int plugin_id, const wchar_t*, const wchar_t*, NSCAPI::nagiosReturn, const char*, unsigned int);
+
+#define NSC_WRAPPERS_ROUTING() \
+  extern "C" int NSHasRoutingHandler(unsigned int plugin_id); \
+  extern "C" int NSRouteMessage(unsigned int plugin_id, const wchar_t*, const wchar_t*, NSCAPI::nagiosReturn, const char*, unsigned int);
 
 //////////////////////////////////////////////////////////////////////////
@@ -70 +76 @@
 #endif
 
-#define NSC_WRAPPERS_MAIN_DEF(toObject) \
+template<class impl_type>
+struct plugin_instance_data {
+  typedef std::map<unsigned int, boost::shared_ptr<impl_type> > plugin_list_type;
+  plugin_list_type plugins;
+  boost::shared_ptr<impl_type> get(unsigned int id) {
+    plugin_list_type::iterator it = plugins.find(id);
+    if (it != plugins.end())
+      return it->second;
+    boost::shared_ptr<impl_type> impl = boost::shared_ptr<impl_type>(new impl_type());
+    plugins[id] = impl;
+    return impl; 
+  }
+  void erase(unsigned int id) {
+    plugins.erase(id);
+  }
+};
+
+
+#define NSC_WRAPPERS_MAIN_DEF(impl_class) \
+  static plugin_instance_data<impl_class> plugin_instance; \
   extern int NSModuleHelperInit(unsigned int id, nscapi::core_api::lpNSAPILoader f) { \
     try { \
@@ -79 +104 @@
     } \
   } \
-  extern int NSLoadModuleEx(wchar_t* alias, int mode) { \
-  try { \
-  return GET_PLUGIN()->wrapLoadModule(toObject.loadModuleEx(alias, mode)); \
+  extern int NSLoadModuleEx(unsigned int id, wchar_t* alias, int mode) { \
+  try { \
+  return GET_PLUGIN()->wrapLoadModule(plugin_instance.get(id)->loadModuleEx(alias, mode)); \
     } catch (...) { \
     NSC_LOG_CRITICAL(_T("Unknown exception in: wrapLoadModule(...)")); \
@@ -88 +113 @@
   } \
   extern int NSLoadModule() { \
-  try { \
-  return GET_PLUGIN()->wrapLoadModule(toObject.loadModule()); \
-    } catch (...) { \
-    NSC_LOG_CRITICAL(_T("Unknown exception in: wrapLoadModule(...)")); \
     return NSCAPI::hasFailed; \
-    } \
   } \
   extern int NSGetModuleName(wchar_t* buf, int buflen) { \
     try { \
-      return GET_PLUGIN()->wrapGetModuleName(buf, buflen, toObject.getModuleName()); \
+      return GET_PLUGIN()->wrapGetModuleName(buf, buflen, impl_class::getModuleName()); \
     } catch (...) { \
       NSC_LOG_CRITICAL(_T("Unknown exception in: wrapGetModuleName(...)")); \
@@ -105 +125 @@
   extern int NSGetModuleDescription(wchar_t* buf, int buflen) { \
     try { \
-      return GET_PLUGIN()->wrapGetModuleName(buf, buflen, toObject.getModuleDescription()); \
+      return GET_PLUGIN()->wrapGetModuleName(buf, buflen, impl_class::getModuleDescription()); \
     } catch (...) { \
       NSC_LOG_CRITICAL(_T("Unknown exception in: wrapGetModuleName(...)")); \
@@ -113 +133 @@
   extern int NSGetModuleVersion(int *major, int *minor, int *revision) { \
     try { \
-      return GET_PLUGIN()->wrapGetModuleVersion(major, minor, revision, toObject.getModuleVersion()); \
+      return GET_PLUGIN()->wrapGetModuleVersion(major, minor, revision, impl_class::getModuleVersion()); \
     } catch (...) { \
       NSC_LOG_CRITICAL(_T("Unknown exception in: wrapGetModuleVersion(...)")); \
@@ -119 +139 @@
     } \
   } \
-  extern int NSUnloadModule() { \
-    try { \
-      return GET_PLUGIN()->wrapUnloadModule(toObject.unloadModule()); \
+  extern int NSUnloadModule(unsigned int id) { \
+    try { \
+      int ret = GET_PLUGIN()->wrapUnloadModule(plugin_instance.get(id)->unloadModule()); \
+      plugin_instance.erase(id); \
+      return ret; \
     } catch (...) { \
       NSC_LOG_CRITICAL(_T("Unknown exception in: wrapGetModuleVersion(...)")); \
@@ -135 +157 @@
   }
 #define NSC_WRAPPERS_HANDLE_MSG_DEF(toObject) \
-  extern void NSHandleMessage(const char* data) { \
-    try { \
-      toObject.handleMessageRAW(data); \
+  extern void NSHandleMessage(unsigned int id, const char* request_buffer, unsigned int request_buffer_len) { \
+    try { \
+      std::string request(request_buffer, request_buffer_len); \
+      plugin_instance.get(id)->handleMessageRAW(request); \
     } catch (...) { \
       NSC_LOG_CRITICAL(_T("Unknown exception in: handleMessage(...)")); \
     } \
   } \
-  extern NSCAPI::boolReturn NSHasMessageHandler() { \
-    try { \
-      return GET_PLUGIN()->wrapHasMessageHandler(toObject.hasMessageHandler()); \
+  extern NSCAPI::boolReturn NSHasMessageHandler(unsigned int id) { \
+    try { \
+      return GET_PLUGIN()->wrapHasMessageHandler(plugin_instance.get(id)->hasMessageHandler()); \
     } catch (...) { \
       NSC_LOG_CRITICAL(_T("Unknown exception in: wrapHasMessageHandler(...)")); \
@@ -151 +174 @@
   }
 #define NSC_WRAPPERS_IGNORE_MSG_DEF() \
-  extern void NSHandleMessage(const char* data) {} \
-  extern NSCAPI::boolReturn NSHasMessageHandler() { return NSCAPI::isfalse; }
-#define NSC_WRAPPERS_HANDLE_CMD_DEF(toObject) \
-  extern NSCAPI::nagiosReturn NSHandleCommand(const wchar_t* command, const char* request_buffer, const unsigned int request_buffer_len, char** reply_buffer, unsigned int *reply_buffer_len) \
+  extern void NSHandleMessage(unsigned int id, const char* data, unsigned int len) {} \
+  extern NSCAPI::boolReturn NSHasMessageHandler(unsigned int id) { return NSCAPI::isfalse; }
+#define NSC_WRAPPERS_HANDLE_CMD_DEF() \
+  extern NSCAPI::nagiosReturn NSHandleCommand(unsigned int id, const wchar_t* command, const char* request_buffer, const unsigned int request_buffer_len, char** reply_buffer, unsigned int *reply_buffer_len) \
   { \
   try { \
   std::string request(request_buffer, request_buffer_len), reply; \
-  NSCAPI::nagiosReturn retCode = (&toObject)->handleRAWCommand(command, request, reply); \
+  NSCAPI::nagiosReturn retCode = plugin_instance.get(id)->handleRAWCommand(command, request, reply); \
   return GET_PLUGIN()->wrapHandleCommand(retCode, reply, reply_buffer, reply_buffer_len); \
     } catch (...) { \
@@ -165 +188 @@
     } \
   } \
-  extern NSCAPI::boolReturn NSHasCommandHandler() { \
-  try { \
-  return GET_PLUGIN()->wrapHasCommandHandler(toObject.hasCommandHandler()); \
+  extern NSCAPI::boolReturn NSHasCommandHandler(unsigned int id) { \
+  try { \
+  return GET_PLUGIN()->wrapHasCommandHandler(plugin_instance.get(id)->hasCommandHandler()); \
     } catch (...) { \
     NSC_LOG_CRITICAL(_T("Unknown exception in: wrapHasCommandHandler(...)")); \
@@ -173 +196 @@
     } \
   }
+#define NSC_WRAPPERS_ROUTING_DEF() \
+  extern NSCAPI::nagiosReturn NSRouteMessage(unsigned int id, const wchar_t* channel, const wchar_t* command, const char* request_buffer, const unsigned int request_buffer_len) \
+  { \
+  try { \
+  std::string request(request_buffer, request_buffer_len), reply; \
+  return GET_PLUGIN()->wrapRouteMessage(plugin_instance.get(id)->RAWRouteMessage(channel, command, request)); \
+    } catch (...) { \
+    NSC_LOG_CRITICAL(_T("Unknown exception in: wrapHandleCommand(...)")); \
+    return NSCAPI::returnIgnored; \
+    } \
+  } \
+  extern NSCAPI::boolReturn NSHasRoutingHandler(unsigned int id) { \
+  try { \
+  return GET_PLUGIN()->wrapHasRoutingHandler(plugin_instance.get(id)->hasRoutingHandler()); \
+    } catch (...) { \
+    NSC_LOG_CRITICAL(_T("Unknown exception in: wrapHasCommandHandler(...)")); \
+    return NSCAPI::isfalse; \
+    } \
+  }
 #define NSC_WRAPPERS_IGNORE_CMD_DEF() \
-  extern NSCAPI::nagiosReturn NSHandleCommand(const wchar_t* IN_cmd, const unsigned int IN_argsLen, wchar_t **IN_args, \
+  extern NSCAPI::nagiosReturn NSHandleCommand(unsigned int id, const wchar_t* IN_cmd, const unsigned int IN_argsLen, wchar_t **IN_args, \
   wchar_t *OUT_retBufMessage, unsigned int IN_retBufMessageLen, wchar_t *OUT_retBufPerf, unsigned int IN_retBufPerfLen) { \
   return NSCAPI::returnIgnored; \
   } \
-  extern NSCAPI::boolReturn NSHasCommandHandler() { return NSCAPI::isfalse; }
+  extern NSCAPI::boolReturn NSHasCommandHandler(unsigned int id) { return NSCAPI::isfalse; }
 #define NSC_WRAPPERS_IGNORE_NOTIFICATION_DEF() \
   extern void NSHandleNotification(const wchar_t*, const wchar_t*, NSCAPI::nagiosReturn, const char*, unsigned int) {} \
-  extern NSCAPI::boolReturn NSHasNotificationHandler() { return NSCAPI::isfalse; }
-#define NSC_WRAPPERS_HANDLE_NOTIFICATION_DEF(toObject) \
-  extern NSCAPI::nagiosReturn NSHandleNotification(const wchar_t* channel, const wchar_t* command, NSCAPI::nagiosReturn code, const char* result_buffer, unsigned int result_buffer_len) \
+  extern NSCAPI::boolReturn NSHasNotificationHandler(unsigned int id) { return NSCAPI::isfalse; }
+#define NSC_WRAPPERS_HANDLE_NOTIFICATION_DEF() \
+  extern NSCAPI::nagiosReturn NSHandleNotification(unsigned int id, const wchar_t* channel, const wchar_t* command, NSCAPI::nagiosReturn code, const char* result_buffer, unsigned int result_buffer_len) \
   { \
     try { \
       std::string result(result_buffer, result_buffer_len); \
-      return GET_PLUGIN()->wrapHandleNotification((&toObject)->handleRAWNotification(channel, command, code, result)); \
+      return GET_PLUGIN()->wrapHandleNotification(plugin_instance.get(id)->handleRAWNotification(channel, command, code, result)); \
     } catch (...) { \
       NSC_LOG_CRITICAL(_T("Unknown exception in: wrapHasNotificationHandler(...)")); \
@@ -193 +235 @@
     } \
   } \
-  extern NSCAPI::boolReturn NSHasNotificationHandler() { \
-    try { \
-      return GET_PLUGIN()->wrapHasNotificationHandler(toObject.hasNotificationHandler()); \
+  extern NSCAPI::boolReturn NSHasNotificationHandler(unsigned int id) { \
+    try { \
+      return GET_PLUGIN()->wrapHasNotificationHandler(plugin_instance.get(id)->hasNotificationHandler()); \
     } catch (...) { \
       NSC_LOG_CRITICAL(_T("Unknown exception in: wrapHasNotificationHandler(...)")); \
@@ -203 +245 @@
 
 
-#define NSC_WRAPPERS_CLI_DEF(toObject) \
-  extern int NSCommandLineExec(wchar_t *command, char *request_buffer, unsigned int request_len, char **response_buffer, unsigned int *response_len) { \
+#define NSC_WRAPPERS_CLI_DEF() \
+  extern int NSCommandLineExec(unsigned int id, wchar_t *command, char *request_buffer, unsigned int request_len, char **response_buffer, unsigned int *response_len) { \
     try { \
     std::string request = std::string(request_buffer, request_len); \
     std::string response; \
-    NSCAPI::nagiosReturn retCode = (&toObject)->commandRAWLineExec(command, request, response); \
+    NSCAPI::nagiosReturn retCode = plugin_instance.get(id)->commandRAWLineExec(command, request, response); \
     return GET_PLUGIN()->wrapCommandLineExec(retCode, response, response_buffer, response_len); \
     } catch (const std::exception &e) { \
@@ -220 +262 @@
     } \
   } \
-
 
 

include/nscapi/nscapi_plugin_wrapper.cpp

@@ -135 +135 @@
   return has?NSCAPI::istrue:NSCAPI::isfalse;
 }
+NSCAPI::boolReturn nscapi::plugin_wrapper::wrapHasRoutingHandler(bool has) {
+  return has?NSCAPI::istrue:NSCAPI::isfalse;
+}
 
 NSCAPI::nagiosReturn nscapi::plugin_wrapper::wrapHandleNotification(NSCAPI::nagiosReturn retResult) {
+  return retResult;
+}
+NSCAPI::nagiosReturn nscapi::plugin_wrapper::wrapRouteMessage(NSCAPI::nagiosReturn retResult) {
   return retResult;
 }

include/nscapi/nscapi_plugin_wrapper.hpp

@@ -66 +66 @@
     NSCAPI::boolReturn wrapHasCommandHandler(bool has);
     NSCAPI::boolReturn wrapHasMessageHandler(bool has);
+    NSCAPI::boolReturn wrapHasRoutingHandler(bool has);
     NSCAPI::boolReturn wrapHasNotificationHandler(bool has);
     NSCAPI::nagiosReturn wrapHandleNotification(NSCAPI::nagiosReturn retResult);
@@ -71 +72 @@
     NSCAPI::nagiosReturn wrapHandleCommand(NSCAPI::nagiosReturn retResult, const std::string &reply, char **reply_buffer, unsigned int *size);
     NSCAPI::nagiosReturn wrapCommandLineExec(NSCAPI::nagiosReturn retResult, const std::string &reply, char **reply_buffer, unsigned int *size);
+    NSCAPI::nagiosReturn wrapRouteMessage(NSCAPI::nagiosReturn retResult);
     
     void wrapDeleteBuffer(char**buffer);

libs/protobuf/plugin.proto

@@ -23 +23 @@
     optional bool bool_data = 5;
   }
+
+  message KeyValue {
+    required string key = 1;
+    required string value = 2;
+    repeated string data = 3;
+  }
   
 
@@ -30 +36 @@
 
   message Header {
-    enum Type {
-      QUERY_REQUEST = 1;
-      QUERY_RESPONSE = 2;
-      
-      EXEC_REQUEST = 3;
-      EXEC_RESPONSE = 4;
-      
-      LOG_MESSAGE = 5;
-    };
-    required Type type = 1;
-    required Common.Version version = 2;
-    optional Common.Version max_supported_version = 3;
-    
-    optional string sender = 17;
-    optional string recipient = 18;
-    optional int64 id = 19;
-  };
-
+    
+    required Common.Version version = 1;
+    optional Common.Version max_supported_version = 2;
+    
+    optional string sender = 3;
+    optional string recipient = 4;
+    
+    optional int64 id = 16;
+    
+    repeated Common.KeyValue metadata = 5;
+    repeated string tags = 6;
+  };
+
+  message Attachment {
+    
+    optional int64 id = 1;
+    required string type = 2;
+    repeated Common.KeyValue metadata = 3;
+    repeated string tags = 4;
+    required string data = 5;
+  };
+  
   message PerformanceData {
     message IntValue {
@@ -97 +107 @@
     required string command = 2;
     repeated string arguments = 3;
+    repeated Common.Attachment attachments = 17;
   };
 
   required Common.Header header = 1;
   repeated Request payload = 2;
+  repeated Common.Attachment attachments = 3;
 }
 message QueryResponseMessage {
@@ -112 +124 @@
     required Common.ResultCode result = 3;
     required string message = 4;
-    optional string legacyPerf = 17;
     repeated Common.PerformanceData perf = 5;
+    repeated Common.Attachment attachments = 17;
     
   }
@@ -119 +131 @@
   required Common.Header header = 1;
   repeated Response payload = 2;
+  repeated Common.Attachment attachments = 3;
 }
 
@@ -160 +173 @@
     required string command = 2;
     repeated string arguments = 3;
+    repeated Common.Attachment attachments = 17;
   };
 
   required Common.Header header = 1;
   repeated Request payload = 2;
+  repeated Common.Attachment attachments = 3;
 }
 message ExecuteResponseMessage {
@@ -190 +205 @@
     
     optional ResponseData data = 11;
+    repeated Common.Attachment attachments = 17;
     
   }
   required Common.Header header = 1;
   repeated Response payload = 2;
+  repeated Common.Attachment attachments = 3;
 }
 
@@ -206 +223 @@
   required Common.Header header = 1;
   repeated QueryResponseMessage.Response payload = 2;
+  repeated Common.Attachment attachments = 3;
 }
 

modules/CheckDisk/CheckDisk.cpp

@@ -41 +41 @@
 
 namespace sh = nscapi::settings_helper;
-
-CheckDisk gCheckDisk;
 
 CheckDisk::CheckDisk() : show_errors_(false) {
@@ -787 +785 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gCheckDisk);
+NSC_WRAPPERS_MAIN_DEF(CheckDisk);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
-NSC_WRAPPERS_HANDLE_CMD_DEF(gCheckDisk);
+NSC_WRAPPERS_HANDLE_CMD_DEF();

modules/CheckDisk/CheckDisk.h

@@ -38 +38 @@
   bool unloadModule();
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
     return _T("CheckDisk");
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("CheckDisk can check various file and disk related things.\nThe current version has commands to check Size of hard drives and directories.");
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;

modules/CheckEventLog/CheckEventLog.cpp

@@ -51 +51 @@
 #include "simple_registry.hpp"
 #include "eventlog_record.hpp"
-
-CheckEventLog gCheckEventLog;
 
 CheckEventLog::CheckEventLog() {
@@ -375 +373 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gCheckEventLog);
+NSC_WRAPPERS_MAIN_DEF(CheckEventLog);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
-NSC_WRAPPERS_HANDLE_CMD_DEF(gCheckEventLog);
+NSC_WRAPPERS_HANDLE_CMD_DEF();

modules/CheckEventLog/CheckEventLog.h

@@ -27 +27 @@
 
 
-class CheckEventLog  : public nscapi::impl::simple_command, nscapi::impl::simple_plugin {
+class CheckEventLog : public nscapi::impl::simple_command, nscapi::impl::simple_plugin {
 private:
   bool debug_;
@@ -42 +42 @@
   bool unloadModule();
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
     return _T("Event log Checker.");
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("Check for errors and warnings in the event log.\nThis is only supported through NRPE so if you plan to use only NSClient this wont help you at all.");
   }

modules/CheckExternalScripts/CheckExternalScripts.cpp

@@ -34 +34 @@
 
 namespace sh = nscapi::settings_helper;
-
-
-CheckExternalScripts gCheckExternalScripts;
 
 CheckExternalScripts::CheckExternalScripts() {}
@@ -198 +195 @@
   }
 }
-// 
-// 
-// 
-//  std::wstring msg, perf;
-//  NSCAPI::nagiosReturn ret = handleCommand(data.command, data.args, msg, perf);
-//  return nscapi::functions::process_simple_command_result(data.command, ret, msg, perf);
-// }
-// 
-// NSCAPI::nagiosReturn CheckExternalScripts::handleCommand(const std::wstring command, std::list<std::wstring> arguments, std::wstring &message, std::wstring &perf) {
-//  command_list::const_iterator cit = commands.find(command);
-//  bool isAlias = false;
-//  if (cit == commands.end()) {
-//    cit = alias.find(command);
-//    if (cit == alias.end())
-//      return NSCAPI::returnIgnored;
-//    isAlias = true;
-//  }
-// 
-//  const command_data cd = (*cit).second;
-//  std::wstring args = cd.arguments;
-//  if (isAlias || allowArgs_) {
-//    int i=1;
-//    BOOST_FOREACH(std::wstring str, arguments) {
-//      if (!isAlias && !allowNasty_) {
-//        if (str.find_first_of(NASTY_METACHARS) != std::wstring::npos) {
-//          NSC_LOG_ERROR(_T("Request string contained illegal metachars!"));
-//          return NSCAPI::returnIgnored;
-//        }
-//      }
-//      strEx::replace(args, _T("$ARG") + strEx::itos(i++) + _T("$"), str);
-//    }
-//  }
-//  if (isAlias) {
-//    try {
-//      return GET_CORE()->InjectSplitAndCommand(cd.command, args, ' ', message, perf, true);
-//    } catch (boost::escaped_list_error &e) {
-//      NSC_LOG_MESSAGE(_T("Failed to parse alias expression: ") + strEx::string_to_wstring(e.what()));
-//      NSC_LOG_MESSAGE(_T("We will now try parsing the old syntax instead..."));
-//      return GET_CORE()->InjectSplitAndCommand(cd.command, args, ' ', message, perf, false);
-//    }
-//  } else {
-//    int result = process::executeProcess(process::exec_arguments(root_, cd.command + _T(" ") + args, timeout), message, perf);
-//    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 nscapi::plugin_helper::int2nagios(result);
-//  }
-// 
-// }
-
-
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gCheckExternalScripts);
+NSC_WRAPPERS_MAIN_DEF(CheckExternalScripts);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
-NSC_WRAPPERS_HANDLE_CMD_DEF(gCheckExternalScripts);
-
+NSC_WRAPPERS_HANDLE_CMD_DEF();
+

modules/CheckExternalScripts/CheckExternalScripts.h

@@ -80 +80 @@
 
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
     return _T("Check External Scripts");
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("A simple wrapper to run external scripts and batch files.");
   }

modules/CheckHelpers/CheckHelpers.cpp

@@ -31 +31 @@
 #include <settings/client/settings_client.hpp>
 
-
-CheckHelpers gCheckHelpers;
-
 CheckHelpers::CheckHelpers() {
 }
@@ -332 +329 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gCheckHelpers);
+NSC_WRAPPERS_MAIN_DEF(CheckHelpers);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
-NSC_WRAPPERS_HANDLE_CMD_DEF(gCheckHelpers);
+NSC_WRAPPERS_HANDLE_CMD_DEF();

modules/CheckHelpers/CheckHelpers.h

@@ -35 +35 @@
 
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
     return _T("Helper function");
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 3, 0 };
     return version;
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("Various helper function to extend other checks.\nThis is also only supported through NRPE.");
   }

modules/CheckNSCP/CheckNSCP.cpp

@@ -26 +26 @@
 #include <settings/client/settings_client.hpp>
 namespace sh = nscapi::settings_helper;
-
-CheckNSCP gCheckNSCP;
-
-
 
 bool CheckNSCP::loadModule() {
@@ -163 +159 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gCheckNSCP);
-NSC_WRAPPERS_HANDLE_MSG_DEF(gCheckNSCP);
-NSC_WRAPPERS_HANDLE_CMD_DEF(gCheckNSCP);
+NSC_WRAPPERS_MAIN_DEF(CheckNSCP);
+NSC_WRAPPERS_HANDLE_MSG_DEF();
+NSC_WRAPPERS_HANDLE_CMD_DEF();

modules/CheckNSCP/CheckNSCP.h

@@ -47 +47 @@
 
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
     return _T("Check NSCP");
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("Checkes the state of the agent");
   }

modules/CheckSystem/CheckSystem.cpp

@@ -38 +38 @@
 #include <settings/client/settings_client.hpp>
 #include <arrayBuffer.h>
-
-CheckSystem gCheckSystem;
 
 /**
@@ -1625 +1623 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gCheckSystem);
+NSC_WRAPPERS_MAIN_DEF(CheckSystem);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
-NSC_WRAPPERS_HANDLE_CMD_DEF(gCheckSystem);
+NSC_WRAPPERS_HANDLE_CMD_DEF();
 //NSC_WRAPPERS_CLI_DEF(gCheckSystem);
 

modules/CheckSystem/CheckSystem.h

@@ -59 +59 @@
   * @return The module name
   */
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
     return _T("CheckSystem");
   }
@@ -66 +66 @@
   * @return module version
   */
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 3, 0 };
     return version;
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("Various system related checks, such as CPU load, process state, service state memory usage and PDH counters.");
   }

modules/CheckTaskSched/CheckTaskSched.cpp

@@ -38 +38 @@
 #include "settings.hpp"
 
-
-CheckTaskSched gCheckTaskSched;
 
 bool CheckTaskSched::loadModule() {
@@ -184 +182 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gCheckTaskSched);
+NSC_WRAPPERS_MAIN_DEF(CheckTaskSched);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
-NSC_WRAPPERS_HANDLE_CMD_DEF(gCheckTaskSched);
+NSC_WRAPPERS_HANDLE_CMD_DEF();
 //NSC_WRAPPERS_CLI_DEF(gCheckTaskSched);

modules/CheckTaskSched/CheckTaskSched.h

@@ -38 +38 @@
   bool unloadModule();
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
     return _T("CheckTaskSched");
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("CheckTaskSched can check various file and disk related things.\nThe current version has commands to check Size of hard drives and directories.");
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;

modules/CheckTaskSched2/CheckTaskSched2.cpp

@@ -37 +37 @@
 #include <settings/client/settings_client.hpp>
 #include "../CheckTaskSched/settings.hpp"
-
-CheckTaskSched2 gCheckTaskSched2;
 
 bool CheckTaskSched2::loadModule() {
@@ -183 +181 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gCheckTaskSched2);
+NSC_WRAPPERS_MAIN_DEF(CheckTaskSched2);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
-NSC_WRAPPERS_HANDLE_CMD_DEF(gCheckTaskSched2);
+NSC_WRAPPERS_HANDLE_CMD_DEF(CheckTaskSched2);
 //NSC_WRAPPERS_CLI_DEF(gCheckTaskSched);

modules/CheckTaskSched2/CheckTaskSched2.h

@@ -38 +38 @@
   bool unloadModule();
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
     return _T("CheckTaskSched2");
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("CheckTaskSched2 can check various file and disk related things.\nThe current version has commands to check Size of hard drives and directories.");
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;

modules/CheckWMI/CheckWMI.cpp

@@ -32 +32 @@
 
 #include <arrayBuffer.h>
-
-CheckWMI gCheckWMI;
 
 CheckWMI::CheckWMI() {
@@ -443 +441 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gCheckWMI);
+NSC_WRAPPERS_MAIN_DEF(CheckWMI);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
-NSC_WRAPPERS_HANDLE_CMD_DEF(gCheckWMI);
+NSC_WRAPPERS_HANDLE_CMD_DEF();
 //NSC_WRAPPERS_CLI_DEF(gCheckWMI);

modules/CheckWMI/CheckWMI.h

@@ -97 +97 @@
   bool unloadModule();
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
     return _T("CheckWMI");
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("CheckWMI can check various file and disk related things.\nThe current version has commands to check Size of hard drives and directories.");
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;

modules/FileLogger/FileLogger.cpp

@@ -36 +36 @@
 
 namespace sh = nscapi::settings_helper;
-
-FileLogger gFileLogger;
 
 FileLogger::FileLogger() : init_(false) {
@@ -232 +230 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gFileLogger);
-NSC_WRAPPERS_HANDLE_MSG_DEF(gFileLogger);
+NSC_WRAPPERS_MAIN_DEF(FileLogger);
+NSC_WRAPPERS_HANDLE_MSG_DEF();
 NSC_WRAPPERS_IGNORE_CMD_DEF();

modules/FileLogger/FileLogger.h

@@ -44 +44 @@
 
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
     return _T("File logger");
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("Writes errors and (if configured) debug info to a text file.");
   }

modules/LUAScript/LUAScript.cpp

@@ -29 +29 @@
 #include <settings/client/settings_client.hpp>
 
-
-LUAScript gLUAScript;
 
 LUAScript::LUAScript() {
@@ -183 +181 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gLUAScript);
+NSC_WRAPPERS_MAIN_DEF(LUAScript);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
-NSC_WRAPPERS_HANDLE_CMD_DEF(gLUAScript);
+NSC_WRAPPERS_HANDLE_CMD_DEF();

modules/LUAScript/LUAScript.h

@@ -65 +65 @@
   bool reload(std::wstring &msg);
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
     return _T("LUAScript");
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("LUAScript...");
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;

modules/NRPEClient/NRPEClient.cpp

@@ -88 +88 @@
 namespace sh = nscapi::settings_helper;
 
-NRPEClient gNRPEClient;
-
 NRPEClient::NRPEClient() : buffer_length_(0) {
 }
@@ -320 +318 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gNRPEClient);
+NSC_WRAPPERS_MAIN_DEF(NRPEClient);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
-NSC_WRAPPERS_HANDLE_CMD_DEF(gNRPEClient);
-NSC_WRAPPERS_CLI_DEF(gNRPEClient);
-
+NSC_WRAPPERS_HANDLE_CMD_DEF();
+NSC_WRAPPERS_CLI_DEF();
+

modules/NRPEClient/NRPEClient.h

@@ -101 +101 @@
 
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
 #ifdef USE_SSL
     return _T("NRPE client (w/ SSL)");
@@ -108 +108 @@
 #endif
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("A simple client for checking remote NRPE servers (think proxy).\n")
 #ifndef USE_BOOST

modules/NRPEServer/NRPEServer.cpp

@@ -32 +32 @@
 namespace sh = nscapi::settings_helper;
 
-NRPEListener gNRPEListener;
 
 NRPEListener::NRPEListener() : info_(boost::shared_ptr<nrpe::server::handler>(new handler_impl(1024))) {
@@ -183 +182 @@
 }
 
-
-
-
-// void NRPEListener::onAccept(simpleSocket::Socket *client) 
-// {
-//  if (!allowedHosts.inAllowedHosts(client->getAddr())) {
-//    NSC_LOG_ERROR(_T("Unauthorize access from: ") + client->getAddrString());
-//    client->close();
-//    return;
-//  }
-//  try {
-//    simpleSocket::DataBuffer block;
-//    int i;
-//    int maxWait = socketTimeout_*10;
-//    for (i=0;i<maxWait;i++) {
-//      bool lastReadHasMore = false;
-//      try {
-//        lastReadHasMore = client->readAll(block, 1048);
-//      } catch (simpleSocket::SocketException e) {
-//        NSC_LOG_MESSAGE(_T("Could not read NRPE packet from socket :") + e.getMessage());
-//        client->close();
-//        return;
-//      }
-//      if (block.getLength() >= NRPEPacket::getBufferLength(buffer_length_))
-//        break;
-//      if (!lastReadHasMore) {
-//        NSC_LOG_MESSAGE(_T("Could not read a full NRPE packet from socket, only got: ") + strEx::itos(block.getLength()));
-//        client->close();
-//        return;
-//      }
-//      Sleep(100);
-//    }
-//    if (i >= maxWait) {
-//      NSC_LOG_ERROR_STD(_T("Timeout reading NRPE-packet (increase socket_timeout), we only got: ") + strEx::itos(block.getLength()));
-//      client->close();
-//      return;
-//    }
-//    if (block.getLength() == NRPEPacket::getBufferLength(buffer_length_)) {
-//      try {
-//        NRPEPacket out = handlePacket(NRPEPacket(block.getBuffer(), block.getLength(), buffer_length_));
-//        block.copyFrom(out.getBuffer(), out.getBufferLength());
-//      } catch (NRPEPacket::NRPEPacketException e) {
-//        NSC_LOG_ERROR_STD(_T("NRPESocketException: ") + e.getMessage());
-//        try {
-//          NRPEPacket err(NRPEPacket::responsePacket, NRPEPacket::version2, NSCAPI::returnUNKNOWN, _T("Could not construct return paket in NRPE handler check clientside (nsclient.log) logs..."), buffer_length_);
-//          block.copyFrom(err.getBuffer(), err.getBufferLength());
-//        } catch (NRPEPacket::NRPEPacketException e) {
-//          NSC_LOG_ERROR_STD(_T("NRPESocketException (again): ") + e.getMessage());
-//          client->close();
-//          return;
-//        }
-//      }
-//      int maxWait = socketTimeout_*10;
-//      for (i=0;i<maxWait;i++) {
-//        bool lastReadHasMore = false;
-//        try {
-//          if (client->canWrite())
-//            lastReadHasMore = client->sendAll(block);
-//        } catch (simpleSocket::SocketException e) {
-//          NSC_LOG_MESSAGE(_T("Could not send NRPE packet from socket :") + e.getMessage());
-//          client->close();
-//          return;
-//        }
-//        if (!lastReadHasMore) {
-//          client->close();
-//          return;
-//        }
-//        Sleep(100);
-//      }
-//      if (i >= maxWait) {
-//        NSC_LOG_ERROR_STD(_T("Timeout reading NRPE-packet (increase socket_timeout)"));
-//        client->close();
-//        return;
-//      }
-//    } else {
-//      NSC_LOG_ERROR_STD(_T("We got more then we wanted ") + strEx::itos(NRPEPacket::getBufferLength(buffer_length_)) + _T(", we only got: ") + strEx::itos(block.getLength()));
-//      client->close();
-//      return;
-//    }
-//  } catch (simpleSocket::SocketException e) {
-//    NSC_LOG_ERROR_STD(_T("SocketException: ") + e.getMessage());
-//  } catch (NRPEException e) {
-//    NSC_LOG_ERROR_STD(_T("NRPEException: ") + e.getMessage());
-//  } catch (...) {
-//    NSC_LOG_ERROR_STD(_T("Unhandled Exception in NRPE listner..."));
-//  }
-//  client->close();
-// }
-// 
-// NRPEPacket NRPEListener::handlePacket(NRPEPacket p) {
-//  if (p.getType() != NRPEPacket::queryPacket) {
-//    NSC_LOG_ERROR(_T("Request is not a query."));
-//    throw NRPEException(_T("Invalid query type: ") + strEx::itos(p.getType()));
-//  }
-//  if (p.getVersion() != NRPEPacket::version2) {
-//    NSC_LOG_ERROR(_T("Request had unsupported version."));
-//    throw NRPEException(_T("Invalid version"));
-//  }
-//  if (!p.verifyCRC()) {
-//    NSC_LOG_ERROR(_T("Request had invalid checksum."));
-//    throw NRPEException(_T("Invalid checksum"));
-//  }
-//  strEx::token cmd = strEx::getToken(p.getPayload(), '!');
-//  if (cmd.first == _T("_NRPE_CHECK")) {
-//    return NRPEPacket(NRPEPacket::responsePacket, NRPEPacket::version2, NSCAPI::returnOK, _T("I (") + NSCModuleHelper::getApplicationVersionString() + _T(") seem to be doing fine..."), buffer_length_);
-//  }
-//  std::wstring msg, perf;
-// 
-//  if (allowArgs_) {
-//    if (!cmd.second.empty()) {
-//      NSC_LOG_ERROR(_T("Request contained arguments (not currently allowed, check the allow_arguments option)."));
-//      throw NRPEException(_T("Request contained arguments (not currently allowed, check the allow_arguments option)."));
-//    }
-//  }
-//  if (allowNasty_) {
-//    if (cmd.first.find_first_of(NASTY_METACHARS) != std::wstring::npos) {
-//      NSC_LOG_ERROR(_T("Request command contained illegal metachars!"));
-//      throw NRPEException(_T("Request command contained illegal metachars!"));
-//    }
-//    if (cmd.second.find_first_of(NASTY_METACHARS) != std::wstring::npos) {
-//      NSC_LOG_ERROR(_T("Request arguments contained illegal metachars!"));
-//      throw NRPEException(_T("Request command contained illegal metachars!"));
-//    }
-//  }
-//  //TODO REMOVE THIS
-//  //return NRPEPacket(NRPEPacket::responsePacket, NRPEPacket::version2, NSCAPI::returnUNKNOWN, _T("TEST TEST TEST"), buffer_length_);
-// 
-//  NSCAPI::nagiosReturn ret = -3;
-//  try {
-//    ret = NSCModuleHelper::InjectSplitAndCommand(cmd.first, cmd.second, '!', msg, perf);
-//  } catch (...) {
-//    return NRPEPacket(NRPEPacket::responsePacket, NRPEPacket::version2, NSCAPI::returnUNKNOWN, _T("UNKNOWN: Internal exception"), buffer_length_);
-//  }
-//  switch (ret) {
-//    case NSCAPI::returnInvalidBufferLen:
-//      msg = _T("UNKNOWN: Return buffer to small to handle this command.");
-//      ret = NSCAPI::returnUNKNOWN;
-//      break;
-//    case NSCAPI::returnIgnored:
-//      msg = _T("UNKNOWN: No handler for that command");
-//      ret = NSCAPI::returnUNKNOWN;
-//      break;
-//    case NSCAPI::returnOK:
-//    case NSCAPI::returnWARN:
-//    case NSCAPI::returnCRIT:
-//    case NSCAPI::returnUNKNOWN:
-//      break;
-//    default:
-//      msg = _T("UNKNOWN: Internal error.");
-//      ret = NSCAPI::returnUNKNOWN;
-//  }
-//  if (msg.length() >= buffer_length_-1) {
-//    NSC_LOG_ERROR(_T("Truncating returndata as it is bigger then NRPE allowes :("));
-//    msg = msg.substr(0,buffer_length_-2);
-//  }
-//  if (perf.empty()||noPerfData_) {
-//    return NRPEPacket(NRPEPacket::responsePacket, NRPEPacket::version2, ret, msg, buffer_length_);
-//  } else {
-//    return NRPEPacket(NRPEPacket::responsePacket, NRPEPacket::version2, ret, msg + _T("|") + perf, buffer_length_);
-//  }
-// }
-
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gNRPEListener);
+NSC_WRAPPERS_MAIN_DEF(NRPEListener);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
 NSC_WRAPPERS_IGNORE_CMD_DEF();

modules/NRPEServer/NRPEServer.h

@@ -48 +48 @@
 
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
 #ifdef USE_SSL
     return _T("NRPE server");
@@ -55 +55 @@
 #endif
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("A simple server that listens for incoming NRPE connection and handles them.\nNRPE is preferred over NSClient as it is more flexible. You can of cource use both NSClient and NRPE.");
   }

modules/NSCAAgent/NSCAAgent.cpp

@@ -30 +30 @@
 
 #include <settings/client/settings_client.hpp>
-
-NSCAAgent gNSCAAgent;
 
 namespace sh = nscapi::settings_helper;
@@ -176 +174 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gNSCAAgent);
+NSC_WRAPPERS_MAIN_DEF(NSCAAgent);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
 NSC_WRAPPERS_IGNORE_CMD_DEF();
-NSC_WRAPPERS_HANDLE_NOTIFICATION_DEF(gNSCAAgent);
+NSC_WRAPPERS_HANDLE_NOTIFICATION_DEF();

modules/NSCAAgent/NSCAAgent.h

@@ -50 +50 @@
   * @return The module name
   */
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
 #ifdef HAVE_LIBCRYPTOPP
     return _T("NSCAAgent (w/ encryption)");
@@ -61 +61 @@
   * @return module version
   */
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 3, 0 };
     return version;
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return std::wstring(_T("Passive check support (needs NSCA on nagios server).\nAvalible crypto are: ")) + getCryptos();
   }
   bool hasNotificationHandler() { return true; }
 
-  std::wstring getCryptos();
+  static std::wstring getCryptos();
 
   NSCAPI::nagiosReturn handleSimpleNotification(const std::wstring channel, const std::wstring command, NSCAPI::nagiosReturn code, std::wstring msg, std::wstring perf);

modules/NSCPClient/NSCPClient.cpp

@@ -36 +36 @@
 namespace sh = nscapi::settings_helper;
 
-NSCPClient gNSCPClient;
-
 NSCPClient::NSCPClient() : buffer_length_(0) {
 }
@@ -533 +531 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gNSCPClient);
+NSC_WRAPPERS_MAIN_DEF(NSCPClient);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
-NSC_WRAPPERS_HANDLE_CMD_DEF(gNSCPClient);
-NSC_WRAPPERS_CLI_DEF(gNSCPClient);
-
+NSC_WRAPPERS_HANDLE_CMD_DEF();
+NSC_WRAPPERS_CLI_DEF();
+

modules/NSCPClient/NSCPClient.h

@@ -80 +80 @@
 
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
 #ifdef USE_SSL
     return _T("NSCP client (w/ SSL)");
@@ -87 +87 @@
 #endif
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("A simple client for checking remote NSCP servers (think proxy).\n")
 #ifndef USE_SSL

modules/NSCPServer/NSCPServer.cpp

@@ -31 +31 @@
 
 namespace sh = nscapi::settings_helper;
-
-NSCPListener gNSCPListener;
 
 NSCPListener::NSCPListener() : info_(boost::shared_ptr<nscp::server::handler>(new handler_impl(1024))) {
@@ -160 +158 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gNSCPListener);
+NSC_WRAPPERS_MAIN_DEF(NSCPListener);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
 NSC_WRAPPERS_IGNORE_CMD_DEF();

modules/NSCPServer/NSCPServer.h

@@ -48 +48 @@
 
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
 #ifdef USE_SSL
     return _T("NSCP server");
@@ -55 +55 @@
 #endif
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("A simple server that listens for incoming NSCP connection and handles them.");
   }

modules/NSClientServer/NSClientServer.cpp

@@ -27 +27 @@
 #include "settings.hpp"
 #include <settings/client/settings_client.hpp>
-
-NSClientListener gNSClientListener;
-
-
 
 namespace sh = nscapi::settings_helper;
@@ -172 +168 @@
 }
 
-// void NSClientListener::sendTheResponse(simpleSocket::Socket *client, std::string response) {
-//  client->send(response.c_str(), static_cast<int>(response.length()), 0);
-// }
-// 
-// void NSClientListener::retrivePacket(simpleSocket::Socket *client) {
-//  simpleSocket::DataBuffer db;
-//  unsigned int i;
-//  unsigned int maxWait = socketTimeout_*10;
-//  for (i=0;i<maxWait;i++) {
-//    bool lastReadHasMore = false;
-//    try {
-//      lastReadHasMore = client->readAll(db);
-//    } catch (simpleSocket::SocketException e) {
-//      NSC_LOG_ERROR_STD(_T("Read on socket failed: ") + e.getMessage());
-//      client->close();
-//      return;
-//    }
-//    if (db.getLength() > 0) {
-//      unsigned long long pos = db.find('\n');
-//      if (pos==-1) {
-//        std::string incoming(db.getBuffer(), db.getLength());
-//        sendTheResponse(client, parseRequest(incoming));
-//        break;
-//      } else if (pos > 0) {
-//        simpleSocket::DataBuffer buffer = db.unshift(static_cast<const unsigned int>(pos));
-//        std::string bstr(buffer.getBuffer(), buffer.getLength());
-//        db.nibble(1);
-//        std::string rstr(db.getBuffer(), db.getLength());
-//        std::string incoming(buffer.getBuffer(), buffer.getLength());
-//        sendTheResponse(client, parseRequest(incoming) + "\n");
-//      } else {
-//        db.nibble(1);
-//        NSC_LOG_ERROR_STD(_T("First char should (i think) not be a \\n :("));
-//      }
-//    } else if (!lastReadHasMore) {
-//      client->close();
-//      return;
-//    } else {
-//      Sleep(100);
-//    }
-//  }
-//  if (i >= maxWait) {
-//    NSC_LOG_ERROR_STD(_T("Timeout reading NS-client packet (increase socket_timeout)."));
-//    client->close();
-//    return;
-//  }
-// }
-
-// 
-// void NSClientListener::onAccept(simpleSocket::Socket *client) {
-//  if (!allowedHosts.inAllowedHosts(client->getAddr())) {
-//    NSC_LOG_ERROR(_T("Unauthorized access from: ") + client->getAddrString());
-//    client->close();
-//    return;
-//  }
-//  //client->setNonBlock();
-//  retrivePacket(client);
-// 
-// 
-// 
-// // client->readAll(db);
-// // if (db.getLength() > 0) {
-// //   std::wstring incoming(db.getBuffer(), db.getLength());
-// //   NSC_DEBUG_MSG_STD("Incoming data: " + incoming);
-// //   std::wstring response = parseRequest(incoming);
-// //   NSC_DEBUG_MSG("Outgoing data: " + response);
-// //   client->send(response.c_str(), static_cast<int>(response.length()), 0);
-// // }
-//  client->close();
-// }
-
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gNSClientListener);
+NSC_WRAPPERS_MAIN_DEF(NSClientListener);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
 NSC_WRAPPERS_IGNORE_CMD_DEF();

modules/NSClientServer/NSClientServer.h

@@ -40 +40 @@
 
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
     return _T("NSClient server");
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("A simple server that listens for incoming NSClient (check_nt) connection and handles them.\nAlthough NRPE is the preferred method NSClient is fully supported and can be used for simplicity or for compatibility.");
   }

modules/PythonScript/PythonScript.cpp

@@ -32 +32 @@
 
 #include "script_wrapper.hpp"
-
-PythonScript gPythonScript;
 
 PythonScript::PythonScript() {
@@ -99 +97 @@
     ;
   def("log", script_wrapper::log_msg);
-  def("get_alias", script_wrapper::get_alias);
+//  def("get_module_alias", script_wrapper::get_module_alias);
+//  def("get_script_alias", script_wrapper::get_script_alias);
 }
 
@@ -241 +240 @@
   return true;
 }
-
-
 
 bool PythonScript::reload(std::wstring &message) {
@@ -324 +321 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gPythonScript);
+NSC_WRAPPERS_MAIN_DEF(PythonScript);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
-NSC_WRAPPERS_HANDLE_CMD_DEF(gPythonScript);
-NSC_WRAPPERS_CLI_DEF(gPythonScript);
-NSC_WRAPPERS_HANDLE_NOTIFICATION_DEF(gPythonScript);
+NSC_WRAPPERS_HANDLE_CMD_DEF();
+NSC_WRAPPERS_CLI_DEF();
+NSC_WRAPPERS_HANDLE_NOTIFICATION_DEF();

modules/PythonScript/PythonScript.h

@@ -65 +65 @@
   }
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
     return _T("PythonScript");
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("PythonScript...");
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 0, 1 };
     return version;

modules/PythonScript/script_wrapper.cpp

@@ -9 +9 @@
 boost::shared_ptr<script_wrapper::functions> script_wrapper::functions::instance;
 
-extern PythonScript gPythonScript;
+//extern PythonScript gPythonScript;
 
 
@@ -15 +15 @@
   NSC_LOG_ERROR_STD(utf8::cvt<std::wstring>(x));
 }
+/*
 std::string script_wrapper::get_alias() {
   return utf8::cvt<std::string>(gPythonScript.get_alias());
 }
+*/
 
 void script_wrapper::log_exception() {

modules/PythonScript/script_wrapper.hpp

@@ -16 +16 @@
   void log_exception();
   void log_msg(std::wstring x);
-  std::string get_alias();
+  //std::string get_alias();
 
   std::list<std::wstring> convert(boost::python::list lst);

modules/Scheduler/Scheduler.cpp

@@ -27 +27 @@
 
 #include <settings/client/settings_client.hpp>
-
-Scheduler gInstance;
 
 namespace sh = nscapi::settings_helper;
@@ -179 +177 @@
 
 NSC_WRAP_DLL();
-NSC_WRAPPERS_MAIN_DEF(gInstance);
+NSC_WRAPPERS_MAIN_DEF(Scheduler);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
 NSC_WRAPPERS_IGNORE_CMD_DEF();

modules/Scheduler/Scheduler.h

@@ -45 +45 @@
   void on_error(std::wstring error);
 
-  std::wstring getModuleName() {
+  static std::wstring getModuleName() {
     return _T("Scheduler");
   }
-  nscapi::plugin_wrapper::module_version getModuleVersion() {
+  static nscapi::plugin_wrapper::module_version getModuleVersion() {
     nscapi::plugin_wrapper::module_version version = {0, 3, 0 };
     return version;
   }
-  std::wstring getModuleDescription() {
+  static std::wstring getModuleDescription() {
     return _T("A scheduler which schedules checks at regular intervals");
   }

scripts/python/test.py

@@ -1 @@
-from NSCP import Settings, Registry, Core, log, status, get_alias
+from NSCP import Settings, Registry, Core, log, status
 #import sys
 #sys.path.append('D:/source/nscp/build/x64/scripts/python/include')
@@ -39 +39 @@
   message = plugin_pb2.QueryRequestMessage()
   
-  message.header.type = plugin_pb2.Common.Header.QUERY_REQUEST
   message.header.version = plugin_pb2.Common.VERSION_1
 
@@ -105 +104 @@
     prefix = '%s_'%alias
 
-  log('Script: test.py with alias: %s from %s'%(alias, get_alias()))
+  log('Script: test.py with alias: %s'%alias)
 
   conf = Settings.get()

service/CMakeLists.txt

@@ -38 +38 @@
     cli_parser.hpp
     
+    plugin_list.hpp
     commands.hpp
     channels.hpp
+    routers.hpp
     logger.hpp
     service_manager.hpp

service/NSCPlugin.cpp

@@ -42 +42 @@
   ,fGetVersion(NULL)
   ,fCommandLineExec(NULL)
-  ,fShowTray(NULL)
-  ,fHideTray(NULL)
   ,fHasNotificationHandler(NULL)
   ,fHandleNotification(NULL)
+  ,fHasRoutingHandler(NULL)
+  ,fRouteMessage(NULL)
   ,loaded_(false)
   ,lastIsMsgPlugin_(false)
@@ -54 +54 @@
 
 }
-/*
-NSCPlugin::NSCPlugin(NSCPlugin &other)
-  :module_()
-  ,fLoadModule(NULL)
-  ,fGetName(NULL)
-  ,fHasCommandHandler(NULL)
-  ,fUnLoadModule(NULL)
-  ,fHasMessageHandler(NULL)
-  ,fHandleMessage(NULL)
-  ,fGetDescription(NULL)
-  ,fGetVersion(NULL)
-  ,fCommandLineExec(NULL)
-  ,fShowTray(NULL)
-  ,fHideTray(NULL)
-  ,bLoaded_(false)
-  ,lastIsMsgPlugin_(false)
-  ,broken_(false)
-{
-  if (other.bLoaded_) {
-    file_ = other.file_;
-    hModule_ = LoadLibrary(file_.c_str());
-    if (!hModule_)
-      throw NSPluginException(file_, _T("Could not load library: ") + error::lookup::last_error());
-    loadRemoteProcs_();
-    if (!fLoadModule)
-      throw NSPluginException(file_, _T("Critical error (fLoadModule)"));
-    bLoaded_ = other.bLoaded_;
-  }
-}
-*/
 /**
  * Default d-tor
@@ -144 +114 @@
   if (!fLoadModule)
     throw NSPluginException(module_, _T("Critical error (fLoadModule)"));
-  if (fLoadModule(alias_.c_str(), mode)) {
+  if (fLoadModule(plugin_id_, alias_.c_str(), mode)) {
     loaded_ = true;
     return true;
@@ -189 +159 @@
     throw NSPluginException(module_, _T("Module not loaded"));
   try {
-    if (fHasCommandHandler())
+    if (fHasCommandHandler(plugin_id_))
       return true;
     return false;
@@ -205 +175 @@
     throw NSPluginException(module_, _T("Module not loaded"));
   try {
-    if (fHasMessageHandler()) {
+    if (fHasMessageHandler(plugin_id_)) {
       lastIsMsgPlugin_ = true;
       return true;
@@ -220 +190 @@
     return false;
   try {
-    if (fHasNotificationHandler()) {
+    if (fHasNotificationHandler(plugin_id_)) {
+      return true;
+    }
+    return false;
+  } catch (...) {
+    throw NSPluginException(module_, _T("Unhandled exception in hasMessageHandler."));
+  }
+}
+bool NSCPlugin::has_routing_handler() {
+  if (!isLoaded())
+    throw NSPluginException(module_, _T("Module not loaded"));
+  if (!fHasRoutingHandler)
+    return false;
+  try {
+    if (fHasRoutingHandler(plugin_id_)) {
       return true;
     }
@@ -247 +231 @@
     throw NSPluginException(module_, _T("Library is not loaded"));
   try {
-    return fHandleCommand(command, dataBuffer, dataBuffer_len, returnBuffer, returnBuffer_len);
+    return fHandleCommand(plugin_id_, command, dataBuffer, dataBuffer_len, returnBuffer, returnBuffer_len);
   } catch (...) {
     throw NSPluginException(module_, _T("Unhandled exception in handleCommand."));
@@ -253 +237 @@
 }
 
-bool NSCPlugin::handleNotification(const wchar_t *channel, const wchar_t* command, NSCAPI::nagiosReturn code, char* result, unsigned int result_len) {
+bool NSCPlugin::handleNotification(const wchar_t *channel, const wchar_t* command, const char* result, unsigned int result_len) {
   if (!isLoaded() || fHandleNotification == NULL)
     throw NSPluginException(module_, _T("Library is not loaded"));
   try {
-    return fHandleNotification(channel, command, code, result, result_len);
-  } catch (...) {
-    throw NSPluginException(module_, _T("Unhandled exception in handleCommand."));
-  }
-}
-
+    return fHandleNotification(plugin_id_, channel, command, result, result_len);
+  } catch (...) {
+    throw NSPluginException(module_, _T("Unhandled exception in handleNotification."));
+  }
+}
+
+bool NSCPlugin::route_message(const wchar_t *channel, const wchar_t *command, const char* buffer, unsigned int buffer_len, wchar_t **new_channel_buffer, char **new_buffer, unsigned int *new_buffer_len) {
+  if (!isLoaded() || fRouteMessage == NULL)
+    throw NSPluginException(module_, _T("Library is not loaded"));
+  try {
+    return fRouteMessage(plugin_id_, channel, command, buffer, buffer_len, new_channel_buffer, new_buffer, new_buffer_len);
+  } catch (...) {
+    throw NSPluginException(module_, _T("Unhandled exception in route_message."));
+  }
+}
 
 
@@ -294 +287 @@
  * @throws NSPluginException if the module is not loaded.
  */
-void NSCPlugin::handleMessage(const char* data) {
+void NSCPlugin::handleMessage(const char* data, unsigned int len) {
   if (!fHandleMessage)
     throw NSPluginException(module_, _T("Library is not loaded"));
   try {
-    fHandleMessage(data);
+    fHandleMessage(plugin_id_, data, len);
   } catch (...) {
     throw NSPluginException(module_, _T("Unhandled exception in handleMessage."));
@@ -314 +307 @@
     throw NSPluginException(module_, _T("Critical error (fUnLoadModule)"));
   try {
-    fUnLoadModule();
+    fUnLoadModule(plugin_id_);
   } catch (...) {
     throw NSPluginException(module_, _T("Unhandled exception in fUnLoadModule."));
@@ -336 +329 @@
   } catch (...) {
     throw NSPluginException(module_, _T("Unhandled exception in getDescription."));
-  }
-}
-
-void NSCPlugin::showTray() {
-  if (fShowTray == NULL)
-    throw NSPluginException(module_, _T("Critical error (ShowTray)"));
-  try {
-    fShowTray();
-  } catch (...) {
-    throw NSPluginException(module_, _T("Unhandled exception in ShowTray."));
-  }
-}
-void NSCPlugin::hideTray() {
-  if (fHideTray == NULL)
-    throw NSPluginException(module_, _T("Critical error (HideTray)"));
-  try {
-    fHideTray();
-  } catch (...) {
-    throw NSPluginException(module_, _T("Unhandled exception in HideTray."));
   }
 }
@@ -420 +394 @@
     fHandleNotification = (nscapi::plugin_api::lpHandleNotification)module_.load_proc("NSHandleNotification");
     fHasNotificationHandler = (nscapi::plugin_api::lpHasNotificationHandler)module_.load_proc("NSHasNotificationHandler");
-    
-    fShowTray = (nscapi::plugin_api::lpShowTray)module_.load_proc("ShowIcon");
-    fHideTray = (nscapi::plugin_api::lpHideTray)module_.load_proc("HideIcon");
-    
+
+    fHasRoutingHandler = (nscapi::plugin_api::lpHasRoutingHandler)module_.load_proc("NSHasRoutingHandler");
+    fRouteMessage = (nscapi::plugin_api::lpRouteMessage)module_.load_proc("NSRouteMessage");
+
   } catch (NSPluginException &e) {
     throw e;
@@ -454 +428 @@
     throw NSPluginException(module_, _T("Library is not loaded or modules does not support command line"));
   try {
-    return fCommandLineExec(command, request, request_len, reply, reply_len);
+    return fCommandLineExec(plugin_id_, command, request, request_len, reply, reply_len);
   } catch (...) {
     throw NSPluginException(module_, _T("Unhandled exception in handleCommand."));

service/NSCPlugin.h

@@ -118 +118 @@
   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;
+  nscapi::plugin_api::lpHasRoutingHandler fHasRoutingHandler;
+  nscapi::plugin_api::lpRouteMessage fRouteMessage;
 
 public:
   NSCPlugin(const unsigned int id, const boost::filesystem::wpath file, std::wstring alias);
-  //NSCPlugin(NSCPlugin &other);
   virtual ~NSCPlugin(void);
 
@@ -140 +139 @@
   NSCAPI::nagiosReturn handleCommand(const wchar_t *command, const char* dataBuffer, const unsigned int dataBuffer_len, char** returnBuffer, unsigned int *returnBuffer_len);
   NSCAPI::nagiosReturn handleCommand(const wchar_t* command, std::string &request, std::string &reply);
-  bool handleNotification(const wchar_t *channel, const wchar_t* command, NSCAPI::nagiosReturn code, char* result, unsigned int result_len);
+  bool handleNotification(const wchar_t *channel, const wchar_t* command, const char* result, unsigned int result_len);
   void deleteBuffer(char**buffer);
-  void handleMessage(const char* data);
+  void handleMessage(const char* data, unsigned int len);
   void unload(void);
   std::wstring getCongifurationMeta();
@@ -148 +147 @@
   int commandLineExec(const wchar_t* command, const char* request, const unsigned int request_len, char** reply, unsigned int *reply_len);
   bool has_command_line_exec();
-  void showTray();
-  void hideTray();
   bool is_duplicate( boost::filesystem::wpath file, std::wstring alias );
+
+
+  bool has_routing_handler();
+
+  
+  bool route_message(const wchar_t *channel, const wchar_t *command, const char* buffer, unsigned int buffer_len, wchar_t **new_channel_buffer, char **new_buffer, unsigned int *new_buffer_len);
 
   std::wstring get_alias() {

service/NSClient++.cpp

@@ -955 +955 @@
     if (plugin->hasMessageHandler())
       logger_master_.add_plugin(plugin);
+    if (plugin->has_routing_handler())
+      routers_.add_plugin(plugin);
     //settings_manager::get_core()->register_key(_T("/modules"), plugin->getModule(), settings::settings_core::key_string, plugin->getName(), plugin->getDescription(), _T(""), false);
     // TODO add comments elsewhere to the settings store for all loaded modules...
@@ -1160 +1162 @@
 
   Plugin::ExecuteResponseMessage response_message;
-  nscapi::functions::create_simple_header(response_message.mutable_header(), Plugin::Common_Header_Type_EXEC_RESPONSE);
+  nscapi::functions::create_simple_header(response_message.mutable_header());
 
   BOOST_FOREACH(std::string r, responses) {
@@ -1177 +1179 @@
 
 
-
-NSCAPI::errorReturn NSClientT::send_notification(const wchar_t* channel, const wchar_t* command, NSCAPI::nagiosReturn code,  char* result, unsigned int result_len) {
+NSCAPI::errorReturn NSClientT::reroute(std::wstring &channel, const wchar_t* command, std::string &buffer) {
+  BOOST_FOREACH(nsclient::plugin_type p, routers_.get(channel)) {
+    wchar_t *new_channel_buffer;
+    char *new_buffer;
+    unsigned int new_buffer_len;
+    int status = p->route_message(channel.c_str(), command, buffer.c_str(), buffer.size(), &new_channel_buffer, &new_buffer, &new_buffer_len);
+    if (status&NSCAPI::message_modified == NSCAPI::message_modified) {
+      buffer = std::string(new_buffer, new_buffer_len);
+      p->deleteBuffer(&new_buffer);
+    }
+    if (status&NSCAPI::message_routed == NSCAPI::message_routed) {
+      channel = new_channel_buffer;
+      //p->deleteBuffer(new_channel_buffer);
+      return NSCAPI::message_routed;
+    }
+    if (status&NSCAPI::message_ignored == NSCAPI::message_ignored)
+      return NSCAPI::message_ignored;
+    if (status&NSCAPI::message_digested == NSCAPI::message_digested)
+      return NSCAPI::message_ignored;
+  }
+  return NSCAPI::isfalse;
+}
+
+NSCAPI::errorReturn NSClientT::send_notification(const wchar_t* channel, const wchar_t* command, char* buffer, unsigned int buffer_len) {
   boost::shared_lock<boost::shared_mutex> readLock(m_mutexRW, boost::get_system_time() + boost::posix_time::milliseconds(5000));
   if (!readLock.owns_lock()) {
@@ -1184 +1208 @@
     return NSCAPI::hasFailed;
   }
+
+  std::wstring schannel = channel;
+  std::string sbuffer = std::string(buffer, buffer_len);
+  try {
+    int count = 0;
+    while (reroute(schannel, command, sbuffer)==NSCAPI::message_routed && count++ <= 10) {
+      LOG_DEBUG_CORE_STD(_T("Re-routing message to: ") + schannel);
+    }
+    if (count >= 10) {
+      LOG_ERROR_CORE(_T("More then 10 routes, discarding message..."));
+      return NSCAPI::hasFailed;
+    }
+  } catch (nsclient::plugins_list_exception &e) {
+    LOG_ERROR_CORE(_T("Erroro routing channel: ") + std::wstring(channel) + _T(": ") + to_wstring(e.what()));
+    return NSCAPI::hasFailed;
+  } catch (...) {
+    LOG_ERROR_CORE(_T("Error routing channel: ") + std::wstring(channel));
+    return NSCAPI::hasFailed;
+  }
+
   try {
     //LOG_ERROR_CORE_STD(_T("Notifying: ") + strEx::strip_hex(to_wstring(std::string(result,result_len))));
     bool found = false;
-    BOOST_FOREACH(nsclient::channels::plugin_type p, channels_.get(channel)) {
-      p->handleNotification(channel, command, code, result, result_len);
+    BOOST_FOREACH(nsclient::plugin_type p, channels_.get(schannel)) {
+      p->handleNotification(schannel.c_str(), command, sbuffer.c_str(), sbuffer.length());
       found = true;
     }
     if (!found) {
-      LOG_ERROR_CORE_STD(_T("Noone listens for events from: ") + std::wstring(channel));
+      LOG_ERROR_CORE_STD(_T("No one listens for events from: ") + schannel + _T(" (") + std::wstring(channel) + _T(")"));
+      return NSCAPI::hasFailed;
     }
     return NSCAPI::isSuccess;
-  } catch (nsclient::channels::channel_exception &e) {
+  } catch (nsclient::plugins_list_exception &e) {
     LOG_ERROR_CORE(_T("No handler for channel: ") + std::wstring(channel) + _T(": ") + to_wstring(e.what()));
     return NSCAPI::hasFailed;

service/NSClient++.h

@@ -32 +32 @@
 #include "commands.hpp"
 #include "channels.hpp"
+#include "routers.hpp"
 #include "logger.hpp"
 
@@ -110 +111 @@
   nsclient::commands commands_;
   nsclient::channels channels_;
+  nsclient::routers routers_;
   unsigned int next_plugin_id_;
   std::wstring service_name_;
@@ -117 +119 @@
   typedef std::multimap<std::wstring,std::wstring> plugin_alias_list_type;
   // c-tor, d-tor
-  NSClientT(void) : debug_(log_state_unknown), enable_shared_session_(false), commands_(this), channels_(this), next_plugin_id_(0), service_name_(DEFAULT_SERVICE_NAME) {
+  NSClientT(void) : debug_(log_state_unknown), enable_shared_session_(false), commands_(this), channels_(this), routers_(this), next_plugin_id_(0), service_name_(DEFAULT_SERVICE_NAME) {
     logger_master_.start_slave();
   }
@@ -160 +162 @@
   // Member functions
   boost::filesystem::wpath getBasePath(void);
-  NSCAPI::errorReturn send_notification(const wchar_t* channel, const wchar_t* command, NSCAPI::nagiosReturn code, char* result, unsigned int result_len);
+
+  NSCAPI::errorReturn reroute(std::wstring &channel, const wchar_t* command, std::string &buffer);
+  NSCAPI::errorReturn send_notification(const wchar_t* channel, const wchar_t* command, char* buffer, unsigned int buffer_len);
   NSCAPI::nagiosReturn injectRAW(const wchar_t* command, std::string &request, std::string &response);
   NSCAPI::nagiosReturn inject(std::wstring command, std::wstring arguments, std::wstring &msg, std::wstring & perf);

service/channels.hpp

@@ -1 +1 @@
 #pragma once
 
-#include <set>
-
-#include <boost/shared_ptr.hpp>
-#include <boost/foreach.hpp>
-
 #include "NSCPlugin.h"
-#include "logger.hpp"
+#include "plugin_list.hpp"
 
 using namespace nscp::helpers;
 
 namespace nsclient {
-  class channels : boost::noncopyable {
-  public:
-    class channel_exception : public std::exception {
-      std::string what_;
-    public:
-      channel_exception(std::wstring error) throw() : what_(to_string(error).c_str()) {}
-      channel_exception(std::string error) throw() : what_(error.c_str()) {}
-      virtual ~channel_exception() throw() {};
+  struct channels : public plugins_list_with_listener {
 
-      virtual const char* what() const throw() {
-        return what_.c_str();
-      }
-
-    };
-
-    typedef boost::shared_ptr<NSCPlugin> plugin_type;
-    typedef std::map<unsigned long,plugin_type> plugin_list_type;
-    typedef std::set<unsigned long> plugin_id_type;
-    typedef std::map<std::wstring,plugin_id_type > channel_list_type;
-
-
-  private:
-    nsclient::logger *logger_;
-    plugin_list_type plugins_;
-    channel_list_type channels_;
-    boost::shared_mutex mutex_;
-
-  public:
-
-    channels(nsclient::logger *logger) : logger_(logger) {}
+    channels(nsclient::logger *logger) : plugins_list_with_listener(logger) {}
 
     void add_plugin(plugin_type plugin) {
       if (!plugin || !plugin->hasNotificationHandler())
         return;
-      plugins_[plugin->get_id()] = plugin;
-      
+      plugins_list_with_listener::add_plugin(plugin);
     }
 
-    void remove_all() {
-      boost::unique_lock<boost::shared_mutex> writeLock(mutex_, boost::get_system_time() + boost::posix_time::seconds(30));
-      if (!writeLock.owns_lock()) {
-        log_error(__FILE__, __LINE__, _T("Failed to get mutex: channels::remove_all"));
-        return;
-      }
-      channels_.clear();
-      plugins_.clear();
-    }
-
-    void remove_plugin(unsigned long id) {
-      boost::unique_lock<boost::shared_mutex> writeLock(mutex_, boost::get_system_time() + boost::posix_time::seconds(10));
-      if (!writeLock.owns_lock()) {
-        log_error(__FILE__, __LINE__, _T("Failed to get mutex in remove_plugin for plugin id: ") + ::to_wstring(id));
-        return;
-      }
-      channel_list_type::iterator it = channels_.begin();
-      while (it != channels_.end()) {
-        if ((*it).second.count(id) > 0) {
-          channel_list_type::iterator toerase = it;
-          ++it;
-          channels_.erase(toerase);
-        } else
-          ++it;
-      }
-      plugin_list_type::iterator pit = plugins_.find(id);
-      if (pit != plugins_.end())
-        plugins_.erase(pit);
-    }
-
-    void register_listener(unsigned long plugin_id, std::wstring channel) {
-      boost::unique_lock<boost::shared_mutex> writeLock(mutex_, boost::get_system_time() + boost::posix_time::seconds(10));
-      if (!writeLock.owns_lock()) {
-        log_error(__FILE__, __LINE__, _T("Failed to get mutex: ") + channel);
-        return;
-      }
-      std::wstring lc = make_key(channel);
-      if (!have_plugin(plugin_id))
-        throw channel_exception("Failed to find plugin: " + ::to_string(plugin_id));
-      channels_[lc].insert(plugin_id);
-    }
-
-    std::list<std::wstring> list() {
-      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(__FILE__, __LINE__, _T("Failed to get mutex"));
-        return lst;
-      }
-      
-      BOOST_FOREACH(channel_list_type::value_type i, channels_) {
-        lst.push_back(i.first);
-      }
-      return lst;
-    }
-
-    std::list<plugin_type> get(std::wstring channel) {
-      boost::shared_lock<boost::shared_mutex> readLock(mutex_, boost::get_system_time() + boost::posix_time::seconds(5));
-      if (!readLock.owns_lock()) {
-        log_error(__FILE__, __LINE__, _T("Failed to get mutex: ") + channel);
-        throw channel_exception("Failed to get mutex (channel::get)");
-      }
-      std::wstring lc = make_key(channel);
-      channel_list_type::iterator cit = channels_.find(lc);
-      if (cit == channels_.end()) {
-        throw channel_exception("Channel not found: " + to_string(channel));
-      }
-      std::list<plugin_type> ret;
-      BOOST_FOREACH(unsigned long id, cit->second) {
-        ret.push_back(plugins_[id]);
-      }
-      return ret;
-    }
-
-    std::wstring to_wstring() {
-      std::wstring ret;
-      BOOST_FOREACH(std::wstring str, list()) {
-        if (!ret.empty()) ret += _T(", ");
-        ret += str;
-      }
-      return ret;
-    }
-
-    inline std::wstring make_key(std::wstring key) {
-      return boost::algorithm::to_lower_copy(key);
-    }
-    void log_error(std::string file, int line, std::wstring error) {
-      if (logger_ != NULL)
-        logger_->nsclient_log_error(file, line, error);
-    }
-
-    inline bool have_plugin(unsigned long plugin_id) {
-      return !(plugins_.find(plugin_id) == plugins_.end());
-    }
   };
 }

service/core_api.cpp

@@ -483 +483 @@
 }
 
-NSCAPI::errorReturn NSAPINotify(const wchar_t* channel, const wchar_t* command, NSCAPI::nagiosReturn code,  char* result, unsigned int result_len) {
-  return mainClient.send_notification(channel, command, code, result, result_len);
+NSCAPI::errorReturn NSAPINotify(const wchar_t* channel, const wchar_t* command, char* result, unsigned int result_len) {
+  return mainClient.send_notification(channel, command, result, result_len);
 }
 

service/core_api.h

@@ -60 +60 @@
 NSCAPI::errorReturn NSAPIReleasePluginList(int,NSCAPI::plugin_info*[]);
 NSCAPI::errorReturn NSAPISettingsSave(void);
-NSCAPI::errorReturn NSAPINotify(const wchar_t*, const wchar_t*, NSCAPI::nagiosReturn, char*, unsigned int);
+NSCAPI::errorReturn NSAPINotify(const wchar_t*, const wchar_t*, char*, unsigned int);
 void NSAPIDestroyBuffer(char**);
 NSCAPI::errorReturn NSAPIExpandPath(const wchar_t*,wchar_t*,unsigned int);

service/logger.hpp

@@ -214 +214 @@
             const char* cache_buf = s.c_str();
             BOOST_FOREACH(plugin_type p, plugins_) {
-              p->handleMessage(cache_buf);
+              p->handleMessage(cache_buf, s.length());
             }
           }
@@ -220 +220 @@
         }
         const char* buf = buffer.c_str();
+        unsigned int len = buffer.length();
         BOOST_FOREACH(plugin_type p, plugins_) {
-          p->handleMessage(buf);
+          p->handleMessage(buf, len);
         }
       }