Changeset 01a278b in nscp for service

Timestamp:

11/22/09 16:23:49 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

1e0bbec

Parents:

b3078b4

Message:

(re)added service support (both w32/*nix) so now it runs as a service again...

Location:

service

Files:

• CMakeLists.txt (modified) (3 diffs)
• NSCPlugin.cpp (modified) (3 diffs)
• NSCPlugin.h (modified) (2 diffs)
• NSClient++.cpp (modified) (40 diffs)
• NSClient++.h (modified) (8 diffs)
• StdAfx.cpp (modified) (1 diff)
• commands.hpp (modified) (1 diff)
• core_api.cpp (modified) (2 diffs)
• core_api.h (modified) (1 diff)

service/CMakeLists.txt

@@ -9 +9 @@
 
 SET(service_SRCS
+  StdAfx.cpp
   NSClient++.cpp
   NSCPlugin.cpp
   core_api.cpp
   settings_manager_impl.cpp
+
   ${NSCP_INCLUDE_PATH}/NSCHelper.cpp
   ${NSCP_INCLUDE_PATH}/arrayBuffer.cpp
   ${NSCP_INCLUDE_PATH}/simpleini/ConvertUTF.c
   ${NSCP_INCLUDE_PATH}/b64/b64.c
+
 )
 
@@ -24 +27 @@
   )
   SET(service_SRCS ${service_SRCS}
+    StdAfx.h
+    NSClient++.h
+    NSCPlugin.h
+    core_api.h
+    settings_manager_impl.h
+    simple_client.hpp
+    
+    commands.hpp
+    logger.hpp
+    settings_logger_impl.hpp
+    service_manager.hpp
+    
     ${NSCP_INCLUDE_PATH}/settings/Settings.h
     ${NSCP_INCLUDE_PATH}/charEx.h
@@ -38 +53 @@
     ${NSCP_INCLUDE_PATH}/dll/impl_unix.hpp
     ${NSCP_INCLUDE_PATH}/dll/impl_w32.hpp
-    core_api.h
-    settings_manager_impl.h
+#   ${NSCP_INCLUDE_PATH}/nsclient_session.hpp
+
+    ${NSCP_INCLUDE_PATH}/service/system_service.hpp
+    ${NSCP_INCLUDE_PATH}/service/win32_service.hpp
   )
+  SET(service_SRCS ${service_SRCS}
+    ${NSCP_INCLUDE_PATH}/service/unix_service.hpp
+  )
+  
   ADD_DEFINITIONS(-D_WIN32_DCOM)
 

service/NSCPlugin.cpp

@@ -22 +22 @@
 #include "NSCPlugin.h"
 #include "core_api.h"
+
+unsigned int NSCPlugin::last_plugin_id_ = 0;
+
+
 /**
  * Default c-tor
@@ -316 +320 @@
 
     try {
-      fModuleHelperInit(NSAPILoader);
+      fModuleHelperInit(get_id(), NSAPILoader);
     } catch (...) {
       throw NSPluginException(module_, _T("Unhandled exception in getDescription."));
@@ -360 +364 @@
   } catch (dll::dll_exception &e) {
     throw NSPluginException(module_, _T("Unhandled exception when loading proces: ") + e.what());
+  } catch (...) {
+    throw NSPluginException(module_, _T("Unhandled exception when loading proces: <UNKNOWN>"));
   }
 

service/NSCPlugin.h

@@ -111 +111 @@
   unsigned int plugin_id_;
 
-  typedef int (*lpModuleHelperInit)(NSCModuleHelper::lpNSAPILoader f);
+  typedef int (*lpModuleHelperInit)(unsigned int, NSCModuleHelper::lpNSAPILoader f);
   typedef int (*lpLoadModule)(int);
   typedef int (*lpGetName)(wchar_t*,unsigned int);
@@ -198 +198 @@
 };
 
-unsigned int NSCPlugin::last_plugin_id_ = 0;
-
-
-
+
+
+

service/NSClient++.cpp

@@ -36 +36 @@
 #include <settings/macros.h>
 #include <NSCHelper.h>
+#include "simple_client.hpp"
+#include "service_manager.hpp"
 
 NSClient mainClient(SZSERVICENAME); // Global core instance.
 bool g_bConsoleLog = false;
+
+
+//////////////////////////////////////////////////////////////////////////
+// Log macros to simplify logging
+// Generally names are of the form LOG_<severity>[_STD] 
+// Where _STD indicates that strings are force wrapped inside a std::wstring
+//
+#define LOG_ERROR_STD(msg) LOG_ERROR(((std::wstring)msg).c_str())
+#define LOG_ERROR(msg) \
+  NSAPIMessage(NSCAPI::error, __FILEW__, __LINE__, msg)
+
+#define LOG_CRITICAL_STD(msg) LOG_CRITICAL(((std::wstring)msg).c_str())
+#define LOG_CRITICAL(msg) \
+  NSAPIMessage(NSCAPI::critical, __FILEW__, __LINE__, msg)
+#define LOG_MESSAGE_STD(msg) LOG_MESSAGE(((std::wstring)msg).c_str())
+#define LOG_MESSAGE(msg) \
+  NSAPIMessage(NSCAPI::log, __FILEW__, __LINE__, msg)
+
+#define LOG_DEBUG_STD(msg) LOG_DEBUG(((std::wstring)msg).c_str())
+#define LOG_DEBUG(msg) \
+  NSAPIMessage(NSCAPI::debug, __FILEW__, __LINE__, msg)
+
+#define LOG_ERROR_CORE(msg) reportMessage(NSCAPI::error, __FILEW__, __LINE__, msg)
+#define LOG_ERROR_CORE_STD(msg) LOG_ERROR_CORE(std::wstring(msg))
+
 
 #define SETTINGS_GET_BOOL_CORE(key) \
@@ -241 +268 @@
   if ( (argc > 1) && ((*argv[1] == '-') || (*argv[1] == '/')) ) {
     if (false) {
-#ifdef WIN32
     } if ( wcscasecmp( _T("install"), argv[1]+1 ) == 0 ) {
-      bool bGui = false;
-      bool bStart = false;
-      std::wstring service_name, service_description;
-      for (int i=2;i<argc;i++) {
-        if (wcscasecmp( _T("gui"), argv[i]) == 0) {
-          bGui = true;
-        } else if (wcscasecmp( _T("start"), argv[i]) == 0) {
-          bStart = true;
-        } else {
-          if (service_name.empty())
-            service_name = argv[i];
-          else {
-            if (!service_description.empty())
-              service_description += _T(" ");
-            service_description += argv[i];
-          }
-        }
-      }
-      if (service_name.empty())
-        service_name = SZSERVICENAME;
-      if (service_description.empty())
-        service_description = SZSERVICEDISPLAYNAME;
-      g_bConsoleLog = true;
-      try {
-        serviceControll::Install(service_name.c_str(), service_description.c_str(), SZDEPENDENCIES);
-        if (bStart)
-          serviceControll::Start(service_name);
-      } catch (const serviceControll::SCException& e) {
-        if (bGui)
-          display(_T("Error installing"), _T("Service installation failed; ") + e.error_);
-        LOG_ERROR_STD(_T("Service installation failed: ") + e.error_);
-        return -1;
-      }
-      try {
-        serviceControll::SetDescription(service_name, service_description);
-      } catch (const serviceControll::SCException& e) {
-        if (bGui)
-          display(_T("Error installing"), _T("Service installation failed; ") + e.error_);
-        LOG_MESSAGE_STD(_T("Couldn't set service description: ") + e.error_);
-      }
-      if (bGui)
-        display(_T("Service installed"), _T("Service installed successfully!"));
-      LOG_MESSAGE(_T("Service installed!"));
-      return 0;
+      nsclient::client::service_manager mgr(argc-1,&argv[1]);
+      return mgr.install();
     } else if ( wcscasecmp( _T("uninstall"), argv[1]+1 ) == 0 ) {
-      bool bGui = false;
-      bool bStop = false;
-      std::wstring service_name;
-      for (int i=2;i<argc;i++) {
-        if (wcscasecmp( _T("gui"), argv[i]) == 0) {
-          bGui = true;
-        } else if (wcscasecmp( _T("stop"), argv[i]) == 0) {
-          bStop = true;
-        } else {
-          service_name = argv[i];
-        }
-      }
-      if (service_name.empty())
-        service_name = SZSERVICENAME;
-      g_bConsoleLog = true;
-      try {
-        if (bStop)
-          serviceControll::Stop(service_name);
-      } catch (const serviceControll::SCException& e) {
-        LOG_MESSAGE_STD(_T("Failed to stop service (") + service_name + _T(") failed; ") + e.error_);
-      }
-      try {
-        serviceControll::Uninstall(service_name);
-      } catch (const serviceControll::SCException& e) {
-        if (bGui)
-          display(_T("Error uninstalling"), _T("Service de-installation (") + service_name + _T(") failed; ") + e.error_ + _T("\nMaybe the service was not previously installed properly?"));
-        LOG_ERROR_STD(_T("Service deinstallation failed; ") + e.error_);
-        return 0;
-      }
-      if (bGui)
-        display(_T("Service uninstalled"), _T("Service uninstalled successfully!"));
-      LOG_MESSAGE(_T("Service uninstalled!"));
-      return 0;
+      nsclient::client::service_manager mgr(argc-1,&argv[1]);
+      return mgr.uninstall();
     } else if ( wcscasecmp( _T("start"), argv[1]+1 ) == 0 ) {
-      g_bConsoleLog = true;
-      bool bGui = false;
-      std::wstring service_name;
-      for (int i=2;i<argc;i++) {
-        if (wcscasecmp( _T("gui"), argv[i]) == 0) {
-          bGui = true;
-        } else {
-          service_name = argv[i];
-        }
-      }
-      if (service_name.empty())
-        service_name = SZSERVICENAME;
-      try {
-        serviceControll::Start(service_name.c_str());
-      } catch (const serviceControll::SCException& e) {
-        if (bGui)
-          display(_T("Service failed to start"), e.error_);
-        LOG_MESSAGE_STD(_T("Service failed to start: ") + e.error_);
-        return -1;
-      }
+      nsclient::client::service_manager mgr(argc-1,&argv[1]);
+      return mgr.start();
     } else if ( wcscasecmp( _T("stop"), argv[1]+1 ) == 0 ) {
-      g_bConsoleLog = true;
-      bool bGui = false;
-      std::wstring service_name;
-      for (int i=2;i<argc;i++) {
-        if (wcscasecmp( _T("gui"), argv[i]) == 0) {
-          bGui = true;
-        } else {
-          service_name = argv[i];
-        }
-      }
-      if (service_name.empty())
-        service_name = SZSERVICENAME;
-      try {
-        serviceControll::Stop(service_name.c_str());
-      } catch (const serviceControll::SCException& e) {
-        if (bGui)
-          display(_T("Service failed to stop"), e.error_);
-        LOG_MESSAGE_STD(_T("Service failed to stop: ") + e.error_);
-        return -1;
-      }
+      nsclient::client::service_manager mgr(argc-1,&argv[1]);
+      return mgr.stop();
     } else if ( wcscasecmp( _T("svc"), argv[1]+1 ) == 0 ) {
-      g_bConsoleLog = true;
-      try {
-        std::wstring exe = serviceControll::get_exe_path(SZSERVICENAME);
-        LOG_MESSAGE_STD(_T("The Service uses: ") + exe);
-      } catch (const serviceControll::SCException& e) {
-        LOG_ERROR_STD(_T("Failed to find service: ") + e.error_);
-      }
-#endif
+      nsclient::client::service_manager mgr(argc-1,&argv[1]);
+      return mgr.print_command();
     } else if ( wcscasecmp( _T("encrypt"), argv[1]+1 ) == 0 ) {
       g_bConsoleLog = true;
@@ -477 +388 @@
           std::wcerr << "Service seems to be started, this is probably not a good idea..." << std::endl;
         }
-      } catch (const serviceControll::SCException& e) {
-        e;// Empty by design
+      } catch (...) {
+        // Empty by design
       }
 #endif
+      nsclient::simple_client client(&mainClient);
       g_bConsoleLog = true;
-      mainClient.enableDebug(true);
-      if (!mainClient.initCore(true)) {
-        LOG_ERROR_STD(_T("Service *NOT* started!"));
-        return -1;
-      }
-      LOG_MESSAGE_STD(_T("Using settings from: ") + settings_manager::get_core()->get_settings_type_desc());
-      LOG_MESSAGE(_T("Enter command to inject or exit to terminate..."));
-/*
-      Settings::get_settings()->clear_cache();
-      LOG_MESSAGE_STD( _T("test 001: ") + SETTINGS_GET_STRING(NSCLIENT_TEST1) );
-      LOG_MESSAGE_STD( _T("test 002: ") + SETTINGS_GET_STRING(NSCLIENT_TEST2) );
-      LOG_MESSAGE_STD( _T("test 003: ") + SETTINGS_GET_STRING(NSCLIENT_TEST3) );
-      LOG_MESSAGE_STD( _T("test 004: ") + SETTINGS_GET_STRING(NSCLIENT_TEST4) );
-
-      Settings::get_settings()->save_to(_T("test.ini"));
-*/
-      std::wstring s = _T("");
-      std::wstring buff = _T("");
-      while (true) {
-        std::wcin >> s;
-        if (s == _T("exit")) {
-          std::wcout << _T("Exiting...") << std::endl;
-          break;
-        } else if (s == _T("plugins")) {
-          std::wcout << _T("Listing plugins...") << std::endl;
-          mainClient.listPlugins();
-        } else if (s == _T("off") && buff == _T("debug ")) {
-          std::wcout << _T("Setting debug log off...") << std::endl;
-          mainClient.enableDebug(false);
-        } else if (s == _T("on") && buff == _T("debug ")) {
-          std::wcout << _T("Setting debug log on...") << std::endl;
-          mainClient.enableDebug(true);
-        } else if (s == _T("reattach")) {
-          std::wcout << _T("Reattaching to session 0") << std::endl;
-          mainClient.startTrayIcon(0);
-//#ifdef DEBUG
-        } else if (s == _T("assert")) {
-          throw "test";
-//#endif
-        } else if (std::cin.peek() < 15) {
-          buff += s;
-          strEx::token t = strEx::getToken(buff, ' ');
-          std::wstring msg, perf;
-          NSCAPI::nagiosReturn ret = mainClient.inject(t.first, t.second, ' ', true, msg, perf);
-          if (ret == NSCAPI::returnIgnored) {
-            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);
-            if (!perf.empty())
-              std::cout << "|" << strEx::wstring_to_string(perf);
-            std::wcout << std::endl;
-          }
-          buff = _T("");
-        } else {
-          buff += s + _T(" ");
-        }
-      }
-      mainClient.exitCore(true);
+      client.start();
       return 0;
     } else {
@@ -565 +419 @@
     return -1;
   }
-  std::wcout << _T("Running as service...") << std::endl;
-  if (!mainClient.StartServiceCtrlDispatcher()) {
-    LOG_MESSAGE(_T("We failed to start the service"));
+  try {
+    std::wcout << _T("Running as service...") << std::endl;
+    mainClient.enableDebug(true);
+    mainClient.start_and_wait();
+  } catch (...) {
+    std::wcerr << _T("Unknown exception in service") << std::endl;
   }
   return nRetCode;
@@ -573 +430 @@
 
 void migrate() {}
+
+std::list<std::wstring> NSClientT::list_commands() {
+  return commands_.list();
+}
 
 NSClientT::plugin_info_list NSClientT::get_all_plugins() {
@@ -655 +516 @@
     if (sarg == _T("migrate")) {
       if (argc == 0) {
-        LOG_ERROR_STD(_T("In correct syntax: nsclient++ -settings migrate <to>"));
+        LOG_ERROR_CORE_STD(_T("In correct syntax: nsclient++ -settings migrate <to>"));
         return;
       }
@@ -667 +528 @@
     } else if (sarg == _T("generate")) {
       if (argc == 0) {
-        LOG_ERROR_STD(_T("In correct syntax: nsclient++ -settings generate <what>"));
-        LOG_ERROR_STD(_T("     where <what> is one of ths following:"));
-        LOG_ERROR_STD(_T("      trac"));
-        LOG_ERROR_STD(_T("      default"));
-        LOG_ERROR_STD(_T("      <type>"));
+        LOG_ERROR_CORE_STD(_T("In correct syntax: nsclient++ -settings generate <what>"));
+        LOG_ERROR_CORE_STD(_T("     where <what> is one of ths following:"));
+        LOG_ERROR_CORE_STD(_T("      trac"));
+        LOG_ERROR_CORE_STD(_T("      default"));
+        LOG_ERROR_CORE_STD(_T("      <type>"));
         return;
       }
@@ -728 +589 @@
       }
     } else {
-      LOG_ERROR_STD(_T("In correct syntax: nsclient++ -settings <keyword>"));
-      LOG_ERROR_STD(_T(" <keyword> : "));
-      LOG_ERROR_STD(_T("   migrate - migrate to a new setings subsystem"));
-      LOG_ERROR_STD(_T("   copy    - copy settings from one subsystem to another"));
-      LOG_ERROR_STD(_T("   set     - Set a setting system as the default store"));
+      LOG_ERROR_CORE_STD(_T("In correct syntax: nsclient++ -settings <keyword>"));
+      LOG_ERROR_CORE_STD(_T(" <keyword> : "));
+      LOG_ERROR_CORE_STD(_T("   migrate - migrate to a new setings subsystem"));
+      LOG_ERROR_CORE_STD(_T("   copy    - copy settings from one subsystem to another"));
+      LOG_ERROR_CORE_STD(_T("   set     - Set a setting system as the default store"));
     }
 
@@ -770 +631 @@
     return false;
   }
+  LOG_MESSAGE(_T("Got settings subsystem..."));
   try {
     if (debug_)
@@ -776 +638 @@
     enable_shared_session_ = SETTINGS_GET_BOOL_CORE(settings_def::SHARED_SESSION);
   } catch (SettingsException e) {
-    LOG_ERROR_STD(_T("Could not find settings: ") + e.getMessage());
+    LOG_ERROR_CORE_STD(_T("Could not find settings: ") + e.getMessage());
   }
 
@@ -833 +695 @@
     com_helper_.initialize();
   } catch (com_helper::com_exception e) {
-    LOG_ERROR_STD(_T("COM exception: ") + e.getMessage());
+    LOG_ERROR_CORE_STD(_T("COM exception: ") + e.getMessage());
     return false;
   } catch (...) {
-    LOG_ERROR_STD(_T("Unknown exception iniating COM..."));
+    LOG_ERROR_CORE(_T("Unknown exception iniating COM..."));
     return false;
   }
@@ -856 +718 @@
           loadPlugin(getBasePath() / boost::filesystem::wpath(_T("modules")) / boost::filesystem::wpath(*cit));
         } catch(const NSPluginException& e) {
-          LOG_ERROR_STD(_T("Exception raised: '") + e.error_ + _T("' in module: ") + e.file_);
+          LOG_ERROR_CORE_STD(_T("Exception raised: '") + e.error_ + _T("' in module: ") + e.file_);
           //return false;
         } catch (std::exception e) {
-          LOG_ERROR_STD(_T("exception loading plugin: ") + (*cit) + strEx::string_to_wstring(e.what()));
+          LOG_ERROR_CORE_STD(_T("exception loading plugin: ") + (*cit) + strEx::string_to_wstring(e.what()));
           return false;
         } catch (...) {
-          LOG_ERROR_STD(_T("Unknown exception loading plugin: ") + (*cit));
+          LOG_ERROR_CORE_STD(_T("Unknown exception loading plugin: ") + (*cit));
           return false;
         }
       }
     } catch (SettingsException e) {
-      LOG_ERROR_STD(_T("Failed to set settings file") + e.getMessage());
+      LOG_ERROR_CORE_STD(_T("Failed to set settings file") + e.getMessage());
     } catch (...) {
-      LOG_ERROR_STD(_T("Unknown exception when loading plugins"));
+      LOG_ERROR_CORE_STD(_T("Unknown exception when loading plugins"));
       return false;
     }
@@ -875 +737 @@
       loadPlugins(boot?NSCAPI::normalStart:NSCAPI::dontStart);
     } catch (...) {
-      LOG_ERROR_STD(_T("Unknown exception loading plugins"));
+      LOG_ERROR_CORE_STD(_T("Unknown exception loading plugins"));
       return false;
     }
@@ -881 +743 @@
   }
   LOG_MESSAGE_STD(_T("NSCLient++ - ") SZVERSION _T(" Started!"));
-  return true;
-}
-
-/**
- * Service control handler startup point.
- * When the program is started as a service this will be the entry point.
- */
-bool NSClientT::InitiateService() {
-  if (!initCore(true))
-    return false;
-/*
-  DWORD dwSessionId = remote_processes::getActiveSessionId();
-  if (dwSessionId != 0xFFFFFFFF)
-    tray_starter::start(dwSessionId);
-  else
-    LOG_ERROR_STD(_T("Failed to start tray helper:" ) + error::lookup::last_error());
-    */
   return true;
 }
@@ -940 +785 @@
       mainClient.unloadPlugins(false);
     } catch(NSPluginException e) {
-      LOG_ERROR_STD(_T("Exception raised when unloading non msg plguins: ") + e.error_ + _T(" in module: ") + e.file_);
+      LOG_ERROR_CORE_STD(_T("Exception raised when unloading non msg plguins: ") + e.error_ + _T(" in module: ") + e.file_);
     } catch(...) {
-      LOG_ERROR_STD(_T("Unknown exception raised when unloading non msg plugins"));
+      LOG_ERROR_CORE_STD(_T("Unknown exception raised when unloading non msg plugins"));
     }
   }
@@ -950 +795 @@
     com_helper_.unInitialize();
   } catch (com_helper::com_exception e) {
-    LOG_ERROR_STD(_T("COM exception: ") + e.getMessage());
+    LOG_ERROR_CORE_STD(_T("COM exception: ") + e.getMessage());
   } catch (...) {
-    LOG_ERROR_STD(_T("Unknown exception uniniating COM..."));
+    LOG_ERROR_CORE_STD(_T("Unknown exception uniniating COM..."));
   }
 #endif
@@ -985 +830 @@
 //    }
   } catch(...) {
-    LOG_ERROR_STD(_T("UNknown exception raised: When closing shared session"));
+    LOG_ERROR_CORE_STD(_T("UNknown exception raised: When closing shared session"));
   }
   if (boot) {
@@ -992 +837 @@
       mainClient.unloadPlugins(true);
     } catch(NSPluginException e) {
-      LOG_ERROR_STD(_T("Exception raised when unloading msg plugins: ") + e.error_ + _T(" in module: ") + e.file_);
+      LOG_ERROR_CORE_STD(_T("Exception raised when unloading msg plugins: ") + e.error_ + _T(" in module: ") + e.file_);
     } catch(...) {
-      LOG_ERROR_STD(_T("UNknown exception raised: When stopping message plguins"));
+      LOG_ERROR_CORE_STD(_T("UNknown exception raised: When stopping message plguins"));
     }
   }
   LOG_MESSAGE_STD(_T("NSCLient++ - ") SZVERSION _T(" Stopped succcessfully"));
   return true;
-}
-/**
- * Service control handler termination point.
- * When the program is stopped as a service this will be the "exit point".
- */
-void NSClientT::TerminateService(void) {
-  exitCore(true);
 }
 #ifdef WIN32x
@@ -1056 +894 @@
     boost::shared_lock<boost::shared_mutex> readLock(m_mutexRW, boost::get_system_time() + boost::posix_time::seconds(5));
     if (!readLock.owns_lock()) {
-      LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
+      LOG_ERROR_CORE(_T("FATAL ERROR: Could not get read-mutex."));
       return -1;
     }
@@ -1070 +908 @@
             return p->commandLineExec(command, argLen, args);
           } catch (NSPluginException e) {
-            LOG_ERROR_STD(_T("Could not execute command: ") + e.error_ + _T(" in ") + e.file_);
+            LOG_ERROR_CORE_STD(_T("Could not execute command: ") + e.error_ + _T(" in ") + e.file_);
             return -1;
           }
@@ -1085 +923 @@
     LOG_MESSAGE_STD(_T("Module (") + e.file_ + _T(") was not found: ") + e.error_);
   }
-  LOG_ERROR_STD(_T("Module not found: ") + module + _T(" available modules are: ") + moduleList);
+  LOG_ERROR_CORE_STD(_T("Module not found: ") + std::wstring(module) + _T(" available modules are: ") + moduleList);
   return 0;
 }
@@ -1096 +934 @@
   boost::shared_lock<boost::shared_mutex> readLock(m_mutexRW, boost::get_system_time() + boost::posix_time::seconds(10));
   if (!readLock.owns_lock()) {
-    LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
+    LOG_ERROR_CORE(_T("FATAL ERROR: Could not get read-mutex."));
     return;
   }
@@ -1111 +949 @@
     boost::unique_lock<boost::shared_mutex> writeLock(m_mutexRW, boost::get_system_time() + boost::posix_time::seconds(10));
     if (!writeLock.owns_lock()) {
-      LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
+      LOG_ERROR_CORE(_T("FATAL ERROR: Could not get read-mutex."));
       return;
     }
@@ -1121 +959 @@
     boost::shared_lock<boost::shared_mutex> readLock(m_mutexRW, boost::get_system_time() + boost::posix_time::milliseconds(5000));
     if (!readLock.owns_lock()) {
-      LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
+      LOG_ERROR_CORE(_T("FATAL ERROR: Could not get read-mutex."));
       return;
     }
@@ -1136 +974 @@
         }
       } catch(NSPluginException e) {
-        LOG_ERROR_STD(_T("Exception raised when unloading plugin: ") + e.error_ + _T(" in module: ") + e.file_);
+        LOG_ERROR_CORE_STD(_T("Exception raised when unloading plugin: ") + e.error_ + _T(" in module: ") + e.file_);
       } catch(...) {
-        LOG_ERROR_STD(_T("Unknown exception raised when unloading plugin"));
+        LOG_ERROR_CORE_STD(_T("Unknown exception raised when unloading plugin"));
       }
     }
@@ -1145 +983 @@
     boost::unique_lock<boost::shared_mutex> writeLock(m_mutexRW, boost::get_system_time() + boost::posix_time::seconds(10));
     if (!writeLock.owns_lock()) {
-      LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
+      LOG_ERROR_CORE(_T("FATAL ERROR: Could not get read-mutex."));
       return;
     }
@@ -1158 +996 @@
         }
       } catch(NSPluginException e) {
-        LOG_ERROR_STD(_T("Exception raised when unloading plugin: ") + e.error_ + _T(" in module: ") + e.file_);
+        LOG_ERROR_CORE_STD(_T("Exception raised when unloading plugin: ") + e.error_ + _T(" in module: ") + e.file_);
       } catch(...) {
-        LOG_ERROR_STD(_T("Unknown exception raised when unloading plugin"));
+        LOG_ERROR_CORE(_T("Unknown exception raised when unloading plugin"));
       }
       it++;
@@ -1172 +1010 @@
     boost::shared_lock<boost::shared_mutex> readLock(m_mutexRW, boost::get_system_time() + boost::posix_time::milliseconds(5000));
     if (!readLock.owns_lock()) {
-      LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
+      LOG_ERROR_CORE(_T("FATAL ERROR: Could not get read-mutex."));
       return;
     }
@@ -1180 +1018 @@
         if (!(*it)->load_plugin(NSCAPI::normalStart)) {
           it = plugins_.erase(it);
-          LOG_ERROR_STD(_T("Plugin refused to load: ") + (*it)->getModule());
+          LOG_ERROR_CORE_STD(_T("Plugin refused to load: ") + (*it)->getModule());
         }
         ++it;
       } catch (NSPluginException e) {
         it = plugins_.erase(it);
-        LOG_ERROR_STD(_T("Could not load plugin: ") + e.file_ + _T(": ") + e.error_);
+        LOG_ERROR_CORE_STD(_T("Could not load plugin: ") + e.file_ + _T(": ") + e.error_);
       } catch (...) {
         it = plugins_.erase(it);
-        LOG_ERROR_STD(_T("Could not load plugin: ") + (*it)->getModule());
+        LOG_ERROR_CORE_STD(_T("Could not load plugin: ") + (*it)->getModule());
       }
     }
@@ -1199 +1037 @@
     } catch(NSPluginException e) {
       it = plugins_.erase(it);
-      LOG_ERROR_STD(_T("Exception raised when loading plugin: ") + e.error_ + _T(" in module: ") + e.file_ + _T(" plugin has been removed."));
+      LOG_ERROR_CORE_STD(_T("Exception raised when loading plugin: ") + e.error_ + _T(" in module: ") + e.file_ + _T(" plugin has been removed."));
     } catch(...) {
       it = plugins_.erase(it);
-      LOG_ERROR_STD(_T("Unknown exception raised when unloading plugin plugin has been removed"));
+      LOG_ERROR_CORE(_T("Unknown exception raised when unloading plugin plugin has been removed"));
     }
   }
@@ -1224 +1062 @@
     boost::unique_lock<boost::shared_mutex> writeLock(m_mutexRW, boost::get_system_time() + boost::posix_time::seconds(10));
     if (!writeLock.owns_lock()) {
-      LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
+      LOG_ERROR_CORE(_T("FATAL ERROR: Could not get read-mutex."));
       return plugin;
     }
@@ -1257 +1095 @@
       return setting_keys::settings_def::PAYLOAD_LEN_DEFAULT;
     } catch (...) {
-      LOG_ERROR(_T("Failed to get length: :("));
+      LOG_ERROR_CORE(_T("Failed to get length: :("));
       return setting_keys::settings_def::PAYLOAD_LEN_DEFAULT;
     }
@@ -1330 +1168 @@
     boost::shared_lock<boost::shared_mutex> readLock(m_mutexRW, boost::get_system_time() + boost::posix_time::milliseconds(5000));
     if (!readLock.owns_lock()) {
-      LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
+      LOG_ERROR_CORE(_T("FATAL ERROR: Could not get read-mutex."));
       return NSCAPI::returnUNKNOWN;
     }
@@ -1338 +1176 @@
         switch (c) {
           case NSCAPI::returnInvalidBufferLen:
-            LOG_ERROR(_T("UNKNOWN: Return buffer to small to handle this command."));
+            LOG_ERROR_CORE(_T("UNKNOWN: Return buffer to small to handle this command."));
             return c;
           case NSCAPI::returnIgnored:
@@ -1350 +1188 @@
             return c;
           default:
-            LOG_ERROR_STD(_T("Unknown error from handleCommand: ") + strEx::itos(c) + _T(" the injected command was: ") + (std::wstring)command);
+            LOG_ERROR_CORE_STD(_T("Unknown error from handleCommand: ") + strEx::itos(c) + _T(" the injected command was: ") + (std::wstring)command);
             return c;
         }
       } catch(const NSPluginException& e) {
-        LOG_ERROR_STD(_T("Exception raised: ") + e.error_ + _T(" in module: ") + e.file_);
+        LOG_ERROR_CORE_STD(_T("Exception raised: ") + e.error_ + _T(" in module: ") + e.file_);
         return NSCAPI::returnCRIT;
       } catch(...) {
-        LOG_ERROR_STD(_T("Unknown exception raised in module"));
+        LOG_ERROR_CORE(_T("Unknown exception raised in module"));
         return NSCAPI::returnCRIT;
       }
@@ -1369 +1207 @@
   boost::shared_lock<boost::shared_mutex> readLock(m_mutexRW, boost::get_system_time() + boost::posix_time::milliseconds(5000));
   if (!readLock.owns_lock()) {
-    LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
+    LOG_ERROR_CORE(_T("FATAL ERROR: Could not get read-mutex."));
     return;
   }
@@ -1380 +1218 @@
       }
     } catch (NSPluginException e) {
-      LOG_ERROR_STD(_T("Could not load plugin: ") + e.file_ + _T(": ") + e.error_);
+      LOG_ERROR_CORE_STD(_T("Could not load plugin: ") + e.file_ + _T(": ") + e.error_);
     }
   }
@@ -1507 +1345 @@
   boost::unique_lock<boost::timed_mutex> lock(internalVariables, boost::get_system_time() + boost::posix_time::seconds(5));
   if (!lock.owns_lock()) {
-    LOG_ERROR(_T("FATAL ERROR: Could not get mutex."));
+    LOG_ERROR_CORE(_T("FATAL ERROR: Could not get mutex."));
     return _T("FATAL ERROR");
   }
@@ -1526 +1364 @@
     settings_manager::get_core()->set_base(basePath);
   } catch (SettingsException e) {
-    LOG_ERROR_STD(_T("Failed to set settings file: ") + e.getMessage());
+    LOG_ERROR_CORE_STD(_T("Failed to set settings file: ") + e.getMessage());
   } catch (...) {
-    LOG_ERROR_STD(_T("Failed to set settings file"));
+    LOG_ERROR_CORE_STD(_T("Failed to set settings file"));
   }
   return basePath;
@@ -1562 +1400 @@
 
 void NSClientT::nsclient_log_error(std::wstring file, int line, std::wstring error) {
-  NSAPIMessage(NSCAPI::error, file.c_str(), line, error);
-}
+  reportMessage(NSCAPI::error, file.c_str(), line, error);
+}
+
+
+
+// Service API
+NSClient* NSClientT::get_global_instance() {
+  return &mainClient;
+}
+void NSClientT::handle_startup() {
+  initCore(true);
+/*
+  DWORD dwSessionId = remote_processes::getActiveSessionId();
+  if (dwSessionId != 0xFFFFFFFF)
+    tray_starter::start(dwSessionId);
+  else
+    LOG_ERROR_STD(_T("Failed to start tray helper:" ) + error::lookup::last_error());
+    */
+}
+void NSClientT::handle_shutdown() {
+  exitCore(true);
+}
+#ifdef _WIN32
+void NSClientT::handle_session_change(unsigned long dwSessionId, bool logon) {
+
+}
+#endif

service/NSClient++.h

@@ -33 +33 @@
 
 //#include <nsclient_session.hpp>
+
+
+class NSClientT;
+typedef service_helper::impl<NSClientT>::system_service NSClient;
 
 /**
@@ -117 +121 @@
   bool plugins_loaded_;
   bool enable_shared_session_;
-
   nsclient::commands commands_;
 
@@ -133 +136 @@
 
   // Service helper functions
-  bool InitiateService();
-  void TerminateService(void);
   bool initCore(bool boot);
   bool exitCore(bool boot);
@@ -148 +149 @@
   void nsclient_log_error(std::wstring file, int line, std::wstring error);
 
+  // Service API
+  static NSClient* get_global_instance();
+  void handle_error(unsigned int line, wchar_t *file, std::wstring message) {
+    reportMessage(NSCAPI::error, file, line, message);
+  }
+  void handle_startup();
+  void handle_shutdown();
+#ifdef _WIN32
+  void handle_session_change(unsigned long dwSessionId, bool logon);
+#endif
+
 
   // Member functions
-  boost::filesystem::wpath  getBasePath(void);
+  boost::filesystem::wpath getBasePath(void);
   NSCAPI::nagiosReturn injectRAW(const wchar_t* command, const unsigned int argLen, wchar_t **argument, wchar_t *returnMessageBuffer, unsigned int returnMessageBufferLen, wchar_t *returnPerfBuffer, unsigned int returnPerfBufferLen);
   NSCAPI::nagiosReturn inject(std::wstring command, std::wstring arguments, wchar_t splitter, bool escape, std::wstring &msg, std::wstring & perf);
@@ -164 +176 @@
   std::wstring describeCommand(std::wstring command);
   std::list<std::wstring> getAllCommandNames();
-  void registerCommand(std::wstring cmd, std::wstring desc);
+  void registerCommand(unsigned int id, std::wstring cmd, std::wstring desc);
   unsigned int getBufferLength();
   void HandleSettingsCLI(wchar_t* arg, int argc, wchar_t* argv[]);
@@ -173 +185 @@
   void listPlugins();
   plugin_info_list get_all_plugins();
+  std::list<std::wstring> list_commands();
 
   // Shared session interface:
@@ -194 +207 @@
 };
 
-typedef service_helper::impl<NSClientT>::system_service NSClient;
 
 extern NSClient mainClient; // Global core instance forward declaration.
@@ -202 +214 @@
 std::wstring Decrypt(std::wstring str, unsigned int algorithm = NSCAPI::encryption_xor);
 
-//////////////////////////////////////////////////////////////////////////
-// Log macros to simplify logging
-// Generally names are of the form LOG_<severity>[_STD] 
-// Where _STD indicates that strings are force wrapped inside a std::wstring
-//
-#define LOG_ERROR_STD(msg) LOG_ERROR(((std::wstring)msg).c_str())
-#define LOG_ERROR(msg) \
-  NSAPIMessage(NSCAPI::error, __FILEW__, __LINE__, msg)
-#define LOG_CRITICAL_STD(msg) LOG_CRITICAL(((std::wstring)msg).c_str())
-#define LOG_CRITICAL(msg) \
-  NSAPIMessage(NSCAPI::critical, __FILEW__, __LINE__, msg)
-#define LOG_MESSAGE_STD(msg) LOG_MESSAGE(((std::wstring)msg).c_str())
-#define LOG_MESSAGE(msg) \
-  NSAPIMessage(NSCAPI::log, __FILEW__, __LINE__, msg)
-
-#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_STD(msg)

service/StdAfx.cpp

@@ -19 +19 @@
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
 ***************************************************************************/
-#include "stdafx.h"
+#include "StdAfx.h"
 #define COMPILE_NEWAPIS_STUBS 

service/commands.hpp

@@ -10 +10 @@
   public:
     class command_exception : public std::exception {
+      std::string what_;
     public:
-      command_exception(std::wstring error) : std::exception(to_string(error).c_str()) {}
-      command_exception(std::string error) : std::exception(error.c_str()) {}
+      command_exception(std::wstring error) throw() : what_(to_string(error).c_str()) {}
+      command_exception(std::string error) throw() : what_(error.c_str()) {}
+      virtual ~command_exception() throw() {};
+
+      virtual const char* what() const throw() {
+        return what_.c_str();
+      }
 
     };

service/core_api.cpp

@@ -29 +29 @@
 #include <b64/b64.h>
 #include <NSCHelper.h>
-
+#ifdef _WIN32
+#include <ServiceCmd.h>
+#endif
+
+#define LOG_ERROR_STD(msg) LOG_ERROR(((std::wstring)msg).c_str())
+#define LOG_ERROR(msg) \
+  NSAPIMessage(NSCAPI::error, __FILEW__, __LINE__, msg)
+
+#define LOG_CRITICAL_STD(msg) LOG_CRITICAL(((std::wstring)msg).c_str())
+#define LOG_CRITICAL(msg) \
+  NSAPIMessage(NSCAPI::critical, __FILEW__, __LINE__, msg)
+#define LOG_MESSAGE_STD(msg) LOG_MESSAGE(((std::wstring)msg).c_str())
+#define LOG_MESSAGE(msg) \
+  NSAPIMessage(NSCAPI::log, __FILEW__, __LINE__, msg)
+
+#define LOG_DEBUG_STD(msg) LOG_DEBUG(((std::wstring)msg).c_str())
+#define LOG_DEBUG(msg) \
+  NSAPIMessage(NSCAPI::debug, __FILEW__, __LINE__, msg)
 
 
@@ -250 +267 @@
   return NSCAPI::isSuccess;
 }
-NSCAPI::errorReturn NSAPIRegisterCommand(const wchar_t* cmd,const wchar_t* desc) {
-  mainClient.registerCommand(cmd, desc);
+NSCAPI::errorReturn NSAPIRegisterCommand(unsigned int id, const wchar_t* cmd,const wchar_t* desc) {
+  try {
+    mainClient.registerCommand(id, cmd, desc);
+  } catch (...) {
+    LOG_ERROR_STD(_T("Unknown exception registrying command: ") + std::wstring(cmd) + _T(", from: ") + to_wstring(id));
+    return NSCAPI::isSuccess;
+
+  }
   return NSCAPI::isSuccess;
 }

service/core_api.h

@@ -52 +52 @@
 NSCAPI::errorReturn NSAPIGetAllCommandNames(wchar_t***, unsigned int *);
 NSCAPI::errorReturn NSAPIReleaseAllCommandNamessBuffer(wchar_t***, unsigned int *);
-NSCAPI::errorReturn NSAPIRegisterCommand(const wchar_t*,const wchar_t*);
+NSCAPI::errorReturn NSAPIRegisterCommand(unsigned int, const wchar_t*,const wchar_t*);
 NSCAPI::errorReturn NSAPISettingsRegKey(const wchar_t*, const wchar_t*, int, const wchar_t*, const wchar_t*, const wchar_t*, int);
 NSCAPI::errorReturn NSAPISettingsRegPath(const wchar_t*, const wchar_t*, const wchar_t*, int);