Changeset 209

Timestamp:

11/10/09 18:25:49 (2 years ago)

Author:

mickem

Message:

swaped the mutexes for the settings subsysytem to boost

Location:

trunk

Files:

• NSClient++-2005.sln (modified) (8 diffs)
• include/settings/Settings.h (modified) (12 diffs)
• include/settings/settings_ini.hpp (modified) (1 diff)
• service/NSClient++.cpp (modified) (11 diffs)
• service/NSClient++.h (modified) (3 diffs)

trunk/NSClient++-2005.sln

@@ -271 +271 @@
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug|Mixed Platforms.Build.0 = Debug|x64
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug|Win32.ActiveCfg = Debug|Win32
-    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug|Win32.Build.0 = Debug|Win32
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug|x64.ActiveCfg = Debug|x64
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug|x64.Build.0 = Debug|x64
@@ -306 +305 @@
     {BA246C01-063A-4548-8957-32D5CC76171B}.Debug|Mixed Platforms.Build.0 = Debug|x64
     {BA246C01-063A-4548-8957-32D5CC76171B}.Debug|Win32.ActiveCfg = Debug|Win32
-    {BA246C01-063A-4548-8957-32D5CC76171B}.Debug|Win32.Build.0 = Debug|Win32
     {BA246C01-063A-4548-8957-32D5CC76171B}.Debug|x64.ActiveCfg = Debug|x64
     {BA246C01-063A-4548-8957-32D5CC76171B}.Debug|x64.Build.0 = Debug|x64
@@ -341 +339 @@
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug|Mixed Platforms.Build.0 = Debug|x64
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug|Win32.ActiveCfg = Debug|Win32
-    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug|Win32.Build.0 = Debug|Win32
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug|x64.ActiveCfg = Debug|x64
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug|x64.Build.0 = Debug|x64
@@ -442 +439 @@
     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug|Mixed Platforms.Build.0 = Debug|x64
     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug|Win32.ActiveCfg = Debug|Win32
-    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug|Win32.Build.0 = Debug|Win32
     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug|x64.ActiveCfg = Debug|x64
     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug|x64.Build.0 = Debug|x64
@@ -477 +473 @@
     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Debug|Mixed Platforms.Build.0 = Debug|x64
     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Debug|Win32.ActiveCfg = Debug|Win32
-    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Debug|Win32.Build.0 = Debug|Win32
     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Debug|x64.ActiveCfg = Debug|x64
     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Debug|x64.Build.0 = Debug|x64
@@ -512 +507 @@
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug|Mixed Platforms.Build.0 = Debug|x64
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug|Win32.ActiveCfg = Debug|Win32
-    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug|Win32.Build.0 = Debug|Win32
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug|x64.ActiveCfg = Debug|x64
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug|x64.Build.0 = Debug|x64
@@ -869 +863 @@
     {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Debug|Mixed Platforms.Build.0 = Debug|x64
     {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Debug|Win32.ActiveCfg = Debug|Win32
-    {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Debug|Win32.Build.0 = Debug|Win32
     {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Debug|x64.ActiveCfg = Debug|x64
     {53FB9872-5E74-4E62-892D-AD82C2ED67CE}.Debug|x64.Build.0 = Debug|x64
@@ -1026 +1019 @@
     {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Mixed Platforms.Build.0 = Debug|x64
     {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Win32.ActiveCfg = Debug|Win32
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|Win32.Build.0 = Debug|Win32
     {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|x64.ActiveCfg = Debug|x64
     {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}.Debug|x64.Build.0 = Debug|x64

trunk/include/settings/Settings.h

@@ -24 +24 @@
 #include <string>
 #include <map>
-#include <Mutex.h>
+#include <boost/thread/thread.hpp>
+#include <boost/thread/locks.hpp>
+#include <strEx.h>
 #define BUFF_LEN 4096
 
@@ -615 +617 @@
     SettingsInterface* instance_;
     instance_list instances_;
-    MutexHandler mutexHandler_;
+    boost::timed_mutex mutexHandler_;
     /*
     struct key_description : public SettingsCore::key_description {
@@ -714 +716 @@
 
     SettingsInterface* get() {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("Failed to get mutext, cant get settings instance"));
       if (instance_ == NULL)
@@ -724 +726 @@
     }
     SettingsInterface* get(SettingsCore::settings_type type) {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("Failed to get mutext, cant get settings instance"));
       return instance_unsafe(type);
@@ -783 +785 @@
         get_logger()->debug(__FILEW__, __LINE__, _T("Starting to migrate..."));
 #endif
-        MutexLock mutex(mutexHandler_);
-        if (!mutex.hasMutex())
+        boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+        if (!mutex.owns_lock())
           throw SettingsException(_T("migrate_type: Failed to get mutext, cant get settings instance"));
         SettingsInterface* iFrom = instance_unsafe(from);
@@ -803 +805 @@
     }
     SettingsCore::settings_type get_settings_type() {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("Failed to get mutext, cant get load settings"));
       if (instance_ == NULL)
@@ -823 +825 @@
     }
     bool has_type(SettingsCore::settings_type type) {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("has_type Failed to get mutext, cant get access settings"));
       instance_list::const_iterator cit = instances_.find(type);
@@ -830 +832 @@
     }
     void set_type(SettingsCore::settings_type type) {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("set_type Failed to get mutext, cant get access settings"));
       instance_list::const_iterator cit = instances_.find(type);
@@ -839 +841 @@
     }
     void add_type_impl(SettingsCore::settings_type type, SettingsInterface* impl) {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("add_type_impl Failed to get mutext, cant get access settings"));
       instance_list::iterator it = instances_.find(type);
@@ -1150 +1152 @@
 
     void add_instance(SettingsInterface *instance) {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("load_all_instance Failed to get mutext, cant get access settings"));
       instance_list::iterator it = instances_.find(instance->get_type());
@@ -1172 +1174 @@
   private:
     void destroy_all_instances() {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("destroy_all_instances Failed to get mutext, cant get access settings"));
       instance_ = NULL;
@@ -1186 +1188 @@
     }
     SettingsInterface *get_default_settings_instance_unsafe() {
-      MutexLock mutex(mutexHandler_);
-      if (!mutex.hasMutex())
+      boost::unique_lock<boost::timed_mutex> mutex(mutexHandler_, boost::get_system_time() + boost::posix_time::seconds(5));
+      if (!mutex.owns_lock())
         throw SettingsException(_T("destroy_all_instances Failed to get mutext, cant get access settings"));
       instance_ = NULL;

trunk/include/settings/settings_ini.hpp

@@ -5 +5 @@
 #include <settings/Settings.h>
 #include <simpleini/SimpleIni.h>
+#include <error.hpp>
 
 namespace Settings {

trunk/service/NSClient++.cpp

@@ -81 +81 @@
   }
 
-  static bool start(DWORD dwSessionId) {
+  static bool start(unsigned long  dwSessionId) {
     std::wstring program = mainClient.getBasePath() +  _T("\\") + 
       SETTINGS_GET_STRING_CORE(settings_def::SYSTRAY_EXE);
@@ -88 +88 @@
   }
 
-  static bool startTrayHelper(DWORD dwSessionId, std::wstring exe, std::wstring cmdline, bool startThread = true) {
-    HANDLE hToken = NULL;
-    if (!remote_processes::GetSessionUserToken(dwSessionId, &hToken)) {
-      LOG_ERROR_STD(_T("Failed to query user token: ") + error::lookup::last_error());
-      return false;
-    } else {
-      STARTUPINFO          StartUPInfo;
-      PROCESS_INFORMATION  ProcessInfo;
-
-      ZeroMemory(&StartUPInfo,sizeof(STARTUPINFO));
-      ZeroMemory(&ProcessInfo,sizeof(PROCESS_INFORMATION));
-      StartUPInfo.wShowWindow = SW_HIDE;
-      StartUPInfo.lpDesktop = L"Winsta0\\Default";
-      StartUPInfo.cb = sizeof(STARTUPINFO);
-
-      wchar_t *buffer = new wchar_t[cmdline.size()+10];
-      wcscpy(buffer, cmdline.c_str());
-      LOG_MESSAGE_STD(_T("Running: ") + exe);
-      LOG_MESSAGE_STD(_T("Running: ") + cmdline);
-
-      LPVOID pEnv =NULL;
-      DWORD dwCreationFlags = CREATE_NO_WINDOW; //0; //DETACHED_PROCESS
-
-      if(CreateEnvironmentBlock(&pEnv,hToken,TRUE)) {
-        dwCreationFlags|=CREATE_UNICODE_ENVIRONMENT;
-      } else {
-        LOG_ERROR_STD(_T("Failed to create enviornment: ") + error::lookup::last_error());
-        pEnv=NULL;
-      }
-      /*
-      LOG_ERROR_STD(_T("Impersonating user: "));
-      if (!ImpersonateLoggedOnUser(hToken)) {
-        LOG_ERROR_STD(_T("Failed to impersonate the user: ") + error::lookup::last_error());
-      }
-
-      wchar_t pszUname[UNLEN + 1];
-      ZeroMemory(pszUname,sizeof(pszUname));
-      DWORD dwSize = UNLEN;
-      if (!GetUserName(pszUname,&dwSize)) {
-        DWORD dwErr = GetLastError();
-        if (!RevertToSelf())
-          LOG_ERROR_STD(_T("Failed to revert to self: ") + error::lookup::last_error());
-        LOG_ERROR_STD(_T("Failed to get username: ") + error::format::from_system(dwErr));
-        return false;
-      }
-      
-
-      PROFILEINFO info;
-      info.dwSize = sizeof(PROFILEINFO);
-      info.lpUserName = pszUname;
-      if (!LoadUserProfile(hToken, &info)) {
-        DWORD dwErr = GetLastError();
-        if (!RevertToSelf())
-          LOG_ERROR_STD(_T("Failed to revert to self: ") + error::lookup::last_error());
-        LOG_ERROR_STD(_T("Failed to get username: ") + error::format::from_system(dwErr));
-        return false;
-      }
-      */
-      if (!CreateProcessAsUser(hToken, exe.c_str(), buffer, NULL, NULL, FALSE, dwCreationFlags, pEnv, NULL, &StartUPInfo, &ProcessInfo)) {
-        DWORD dwErr = GetLastError();
-        delete [] buffer;
-        /*
-        if (!RevertToSelf()) {
-          LOG_ERROR_STD(_T("Failed to revert to self: ") + error::lookup::last_error());
-        }
-        */
-        if (startThread && dwErr == ERROR_PIPE_NOT_CONNECTED) {
-          LOG_MESSAGE(_T("Failed to start trayhelper: starting a background thread to do it instead..."));
-          Thread<tray_starter> *pThread = new Thread<tray_starter>(_T("tray-starter-thread"));
-          pThread->createThread(tray_starter::init(dwSessionId, exe, cmdline));
-          return false;
-        } else if (dwErr == ERROR_PIPE_NOT_CONNECTED) {
-          LOG_ERROR_STD(_T("Thread failed to start trayhelper (will try again): ") + error::format::from_system(dwErr));
-          return false;
-        } else {
-          LOG_ERROR_STD(_T("Failed to start trayhelper: ") + error::format::from_system(dwErr));
-          return true;
-        }
-      } else {
-        delete [] buffer;
-        /*
-        if (!RevertToSelf()) {
-          LOG_ERROR_STD(_T("Failed to revert to self: ") + error::lookup::last_error());
-        }
-        */
-        LOG_MESSAGE_STD(_T("Started tray in other user session: ") + strEx::itos(dwSessionId));
-      }
-
-
-      CloseHandle(hToken);
-      return true;
-    }
+  static bool startTrayHelper(unsigned long dwSessionId, std::wstring exe, std::wstring cmdline, bool startThread = true) {
+//    HANDLE hToken = NULL;
+//    if (!remote_processes::GetSessionUserToken(dwSessionId, &hToken)) {
+//      LOG_ERROR_STD(_T("Failed to query user token: ") + error::lookup::last_error());
+//      return false;
+//    } else {
+//      STARTUPINFO          StartUPInfo;
+//      PROCESS_INFORMATION  ProcessInfo;
+// 
+//      ZeroMemory(&StartUPInfo,sizeof(STARTUPINFO));
+//      ZeroMemory(&ProcessInfo,sizeof(PROCESS_INFORMATION));
+//      StartUPInfo.wShowWindow = SW_HIDE;
+//      StartUPInfo.lpDesktop = L"Winsta0\\Default";
+//      StartUPInfo.cb = sizeof(STARTUPINFO);
+// 
+//      wchar_t *buffer = new wchar_t[cmdline.size()+10];
+//      wcscpy(buffer, cmdline.c_str());
+//      LOG_MESSAGE_STD(_T("Running: ") + exe);
+//      LOG_MESSAGE_STD(_T("Running: ") + cmdline);
+// 
+//      LPVOID pEnv =NULL;
+//      DWORD dwCreationFlags = CREATE_NO_WINDOW; //0; //DETACHED_PROCESS
+// 
+//      if(CreateEnvironmentBlock(&pEnv,hToken,TRUE)) {
+//        dwCreationFlags|=CREATE_UNICODE_ENVIRONMENT;
+//      } else {
+//        LOG_ERROR_STD(_T("Failed to create enviornment: ") + error::lookup::last_error());
+//        pEnv=NULL;
+//      }
+//      /*
+//      LOG_ERROR_STD(_T("Impersonating user: "));
+//      if (!ImpersonateLoggedOnUser(hToken)) {
+//        LOG_ERROR_STD(_T("Failed to impersonate the user: ") + error::lookup::last_error());
+//      }
+// 
+//      wchar_t pszUname[UNLEN + 1];
+//      ZeroMemory(pszUname,sizeof(pszUname));
+//      DWORD dwSize = UNLEN;
+//      if (!GetUserName(pszUname,&dwSize)) {
+//        DWORD dwErr = GetLastError();
+//        if (!RevertToSelf())
+//          LOG_ERROR_STD(_T("Failed to revert to self: ") + error::lookup::last_error());
+//        LOG_ERROR_STD(_T("Failed to get username: ") + error::format::from_system(dwErr));
+//        return false;
+//      }
+//      
+// 
+//      PROFILEINFO info;
+//      info.dwSize = sizeof(PROFILEINFO);
+//      info.lpUserName = pszUname;
+//      if (!LoadUserProfile(hToken, &info)) {
+//        DWORD dwErr = GetLastError();
+//        if (!RevertToSelf())
+//          LOG_ERROR_STD(_T("Failed to revert to self: ") + error::lookup::last_error());
+//        LOG_ERROR_STD(_T("Failed to get username: ") + error::format::from_system(dwErr));
+//        return false;
+//      }
+//      */
+//      if (!CreateProcessAsUser(hToken, exe.c_str(), buffer, NULL, NULL, FALSE, dwCreationFlags, pEnv, NULL, &StartUPInfo, &ProcessInfo)) {
+//        DWORD dwErr = GetLastError();
+//        delete [] buffer;
+//        /*
+//        if (!RevertToSelf()) {
+//          LOG_ERROR_STD(_T("Failed to revert to self: ") + error::lookup::last_error());
+//        }
+//        */
+//        if (startThread && dwErr == ERROR_PIPE_NOT_CONNECTED) {
+//          LOG_MESSAGE(_T("Failed to start trayhelper: starting a background thread to do it instead..."));
+//          Thread<tray_starter> *pThread = new Thread<tray_starter>(_T("tray-starter-thread"));
+//          pThread->createThread(tray_starter::init(dwSessionId, exe, cmdline));
+//          return false;
+//        } else if (dwErr == ERROR_PIPE_NOT_CONNECTED) {
+//          LOG_ERROR_STD(_T("Thread failed to start trayhelper (will try again): ") + error::format::from_system(dwErr));
+//          return false;
+//        } else {
+//          LOG_ERROR_STD(_T("Failed to start trayhelper: ") + error::format::from_system(dwErr));
+//          return true;
+//        }
+//      } else {
+//        delete [] buffer;
+//        /*
+//        if (!RevertToSelf()) {
+//          LOG_ERROR_STD(_T("Failed to revert to self: ") + error::lookup::last_error());
+//        }
+//        */
+//        LOG_MESSAGE_STD(_T("Started tray in other user session: ") + strEx::itos(dwSessionId));
+//      }
+// 
+// 
+//      CloseHandle(hToken);
+//      return true;
+//    }
+    return false;
   }
 };
@@ -746 +747 @@
     if (boot) {
       LOG_MESSAGE_STD(_T("Starting shared session..."));
-      try {
-        shared_server_.reset(new nsclient_session::shared_server_session(this));
-        if (!shared_server_->session_exists()) {
-          shared_server_->create_new_session();
-        } else {
-          LOG_ERROR_STD(_T("Session already exists cant create a new one!"));
-        }
-        startTrayIcons();
-      } catch (nsclient_session::session_exception e) {
-        LOG_ERROR_STD(_T("Failed to create new session: ") + e.what());
-        shared_server_.reset(NULL);
-      } catch (...) {
-        LOG_ERROR_STD(_T("Failed to create new session: Unknown exception"));
-        shared_server_.reset(NULL);
-      }
+//      try {
+//        shared_server_.reset(new nsclient_session::shared_server_session(this));
+//        if (!shared_server_->session_exists()) {
+//          shared_server_->create_new_session();
+//        } else {
+//          LOG_ERROR_STD(_T("Session already exists cant create a new one!"));
+//        }
+//        startTrayIcons();
+//      } catch (nsclient_session::session_exception e) {
+//        LOG_ERROR_STD(_T("Failed to create new session: ") + e.what());
+//        shared_server_.reset(NULL);
+//      } catch (...) {
+//        LOG_ERROR_STD(_T("Failed to create new session: Unknown exception"));
+//        shared_server_.reset(NULL);
+//      }
     } else {
       LOG_MESSAGE_STD(_T("Attaching to shared session..."));
-      try {
-        std::wstring id = _T("_attached_") + strEx::itos(GetCurrentProcessId()) + _T("_");
-        shared_client_.reset(new nsclient_session::shared_client_session(id, this));
-        if (shared_client_->session_exists()) {
-          shared_client_->attach_to_session(id);
-        } else {
-          LOG_ERROR_STD(_T("No session was found cant attach!"));
-        }
-        LOG_ERROR_STD(_T("Session is: ") + shared_client_->get_client_id());
-      } catch (nsclient_session::session_exception e) {
-        LOG_ERROR_STD(_T("Failed to attach to session: ") + e.what());
-        shared_client_.reset(NULL);
-      } catch (...) {
-        LOG_ERROR_STD(_T("Failed to attach to session: Unknown exception"));
-        shared_client_.reset(NULL);
-      }
+//      try {
+//        std::wstring id = _T("_attached_") + strEx::itos(GetCurrentProcessId()) + _T("_");
+//        shared_client_.reset(new nsclient_session::shared_client_session(id, this));
+//        if (shared_client_->session_exists()) {
+//          shared_client_->attach_to_session(id);
+//        } else {
+//          LOG_ERROR_STD(_T("No session was found cant attach!"));
+//        }
+//        LOG_ERROR_STD(_T("Session is: ") + shared_client_->get_client_id());
+//      } catch (nsclient_session::session_exception e) {
+//        LOG_ERROR_STD(_T("Failed to attach to session: ") + e.what());
+//        shared_client_.reset(NULL);
+//      } catch (...) {
+//        LOG_ERROR_STD(_T("Failed to attach to session: Unknown exception"));
+//        shared_client_.reset(NULL);
+//      }
     }
   }
@@ -863 +864 @@
 
 void NSClientT::startTrayIcons() {
-  if (shared_server_.get() == NULL) {
-    LOG_MESSAGE_STD(_T("No master session so tray icons not started"));
-    return;
-  }
-  remote_processes::PWTS_SESSION_INFO list;
-  DWORD count;
-  if (!remote_processes::_WTSEnumerateSessions(WTS_CURRENT_SERVER_HANDLE , 0, 1, &list, &count)) {
-    LOG_ERROR_STD(_T("Failed to enumerate sessions:" ) + error::lookup::last_error());
-  } else {
-    LOG_DEBUG_STD(_T("Found ") + strEx::itos(count) + _T(" sessions"));
-    for (DWORD i=0;i<count;i++) {
-      LOG_DEBUG_STD(_T("Found session: ") + strEx::itos(list[i].SessionId) + _T(" state: ") + strEx::itos(list[i].State));
-      if (list[i].State == remote_processes::_WTS_CONNECTSTATE_CLASS::WTSActive) {
-        startTrayIcon(list[i].SessionId);
-      }
-    }
-  }
+//  if (shared_server_.get() == NULL) {
+//    LOG_MESSAGE_STD(_T("No master session so tray icons not started"));
+//    return;
+//  }
+//  remote_processes::PWTS_SESSION_INFO list;
+//  DWORD count;
+//  if (!remote_processes::_WTSEnumerateSessions(WTS_CURRENT_SERVER_HANDLE , 0, 1, &list, &count)) {
+//    LOG_ERROR_STD(_T("Failed to enumerate sessions:" ) + error::lookup::last_error());
+//  } else {
+//    LOG_DEBUG_STD(_T("Found ") + strEx::itos(count) + _T(" sessions"));
+//    for (DWORD i=0;i<count;i++) {
+//      LOG_DEBUG_STD(_T("Found session: ") + strEx::itos(list[i].SessionId) + _T(" state: ") + strEx::itos(list[i].State));
+//      if (list[i].State == remote_processes::_WTS_CONNECTSTATE_CLASS::WTSActive) {
+//        startTrayIcon(list[i].SessionId);
+//      }
+//    }
+//  }
 }
 void NSClientT::startTrayIcon(DWORD dwSessionId) {
-  if (shared_server_.get() == NULL) {
-    LOG_MESSAGE_STD(_T("No master session so tray icons not started"));
-    return;
-  }
-  if (!shared_server_->re_attach_client(dwSessionId)) {
-    if (!tray_starter::start(dwSessionId)) {
-      LOG_ERROR_STD(_T("Failed to start session (") + strEx::itos(dwSessionId) + _T("): " ) + error::lookup::last_error());
-    }
-  }
+//  if (shared_server_.get() == NULL) {
+//    LOG_MESSAGE_STD(_T("No master session so tray icons not started"));
+//    return;
+//  }
+//  if (!shared_server_->re_attach_client(dwSessionId)) {
+//    if (!tray_starter::start(dwSessionId)) {
+//      LOG_ERROR_STD(_T("Failed to start session (") + strEx::itos(dwSessionId) + _T("): " ) + error::lookup::last_error());
+//    }
+//  }
 }
 
@@ -926 +927 @@
   LOG_DEBUG_STD(_T("Stopping: Settings instance"));
   settings_manager::destroy_settings();
+//  try {
+//    if (shared_client_.get() != NULL) {
+//      LOG_DEBUG_STD(_T("Stopping: shared client"));
+//      shared_client_->set_handler(NULL);
+//      shared_client_->close_session();
+//    }
+//  } catch(nsclient_session::session_exception &e) {
+//    LOG_ERROR_STD(_T("Exception closing shared client session: ") + e.what());
+//  } catch(...) {
+//    LOG_ERROR_STD(_T("Exception closing shared client session: Unknown exception!"));
+//  }
   try {
-    if (shared_client_.get() != NULL) {
-      LOG_DEBUG_STD(_T("Stopping: shared client"));
-      shared_client_->set_handler(NULL);
-      shared_client_->close_session();
-    }
-  } catch(nsclient_session::session_exception &e) {
-    LOG_ERROR_STD(_T("Exception closing shared client session: ") + e.what());
-  } catch(...) {
-    LOG_ERROR_STD(_T("Exception closing shared client session: Unknown exception!"));
-  }
-  try {
-    if (shared_server_.get() != NULL) {
-      LOG_DEBUG_STD(_T("Stopping: shared server"));
-      shared_server_->set_handler(NULL);
-      shared_server_->close_session();
-    }
+//    if (shared_server_.get() != NULL) {
+//      LOG_DEBUG_STD(_T("Stopping: shared server"));
+//      shared_server_->set_handler(NULL);
+//      shared_server_->close_session();
+//    }
   } catch(...) {
     LOG_ERROR_STD(_T("UNknown exception raised: When closing shared session"));
@@ -988 +989 @@
  * @param dwCtrlCode 
  */
-void WINAPI NSClientT::service_ctrl_dispatch(DWORD dwCtrlCode) {
+void WINAPI NSClientT::service_ctrl_dispatch(unsigned long dwCtrlCode) {
   mainClient.service_ctrl_ex(dwCtrlCode, NULL, NULL, NULL);
 }
 
 
-void NSClientT::service_on_session_changed(DWORD dwSessionId, bool logon, DWORD dwEventType) {
-  if (shared_server_.get() == NULL) {
-    LOG_DEBUG_STD(_T("No shared session: ignoring change event!"));
-    return;
-  }
+void NSClientT::service_on_session_changed(unsigned long dwSessionId, bool logon, unsigned long dwEventType) {
+//  if (shared_server_.get() == NULL) {
+//    LOG_DEBUG_STD(_T("No shared session: ignoring change event!"));
+//    return;
+//  }
   LOG_DEBUG_STD(_T("Got session change: ") + strEx::itos(dwSessionId));
   if (!logon) {
@@ -1250 +1251 @@
 
 NSCAPI::nagiosReturn NSClientT::inject(std::wstring command, std::wstring arguments, TCHAR splitter, bool escape, std::wstring &msg, std::wstring & perf) {
-  if (shared_client_.get() != NULL && shared_client_->hasMaster()) {
+  /*if (shared_client_.get() != NULL && shared_client_->hasMaster()) {
     try {
       return shared_client_->inject(command, arguments, splitter, escape, msg, perf);
@@ -1260 +1261 @@
       return NSCAPI::returnCRIT;
     }
-  } else {
+  } else */{
     unsigned int aLen = 0;
     TCHAR ** aBuf = arrayBuffer::split2arrayBuffer(arguments, splitter, aLen, escape);
@@ -1297 +1298 @@
     LOG_DEBUG_STD(_T("Injecting: ") + (std::wstring) command + _T(": ") + arrayBuffer::arrayBuffer2string(argument, argLen, _T(", ")));
   }
-  if (shared_client_.get() != NULL && shared_client_->hasMaster()) {
+  /*if (shared_client_.get() != NULL && shared_client_->hasMaster()) {
     try {
       std::wstring msg, perf;
@@ -1312 +1313 @@
       return NSCHelper::wrapReturnString(returnPerfBuffer, returnPerfBufferLen, _T(""), returnCode);
     }
-  } else {
+  } else */{
     boost::shared_lock<boost::shared_mutex> readLock(m_mutexRW, boost::get_system_time() + boost::posix_time::milliseconds(5000));
     if (!readLock.owns_lock()) {
@@ -1406 +1407 @@
       return;
     }
-    if (shared_server_.get() != NULL && shared_server_->hasClients()) {
-      try {
-        shared_server_->sendLogMessageToClients(msgType, file, line, message);
-      } catch (nsclient_session::session_exception e) {
-        log_broken_message(_T("Failed to send message to clients: ") + e.what());
-      }
-    }
+//    if (shared_server_.get() != NULL && shared_server_->hasClients()) {
+//      try {
+//        shared_server_->sendLogMessageToClients(msgType, file, line, message);
+//      } catch (nsclient_session::session_exception e) {
+//        log_broken_message(_T("Failed to send message to clients: ") + e.what());
+//      }
+//    }
     std::wstring file_stl = file;
     std::wstring::size_type pos = file_stl.find_last_of(_T("\\"));

trunk/service/NSClient++.h

@@ -29 +29 @@
 #include <map>
 #include <com_helpers.hpp>
-#include <nsclient_session.hpp>
+//#include <nsclient_session.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/locks.hpp>
@@ -60 +60 @@
  *
  */
-class NSClientT : public nsclient_session::session_handler_interface {
+class NSClientT /*: public nsclient_session::session_handler_interface*/ {
 
 public:
@@ -109 +109 @@
   log_status debug_;
   com_helper::initialize_com com_helper_;
+  /*
   std::auto_ptr<nsclient_session::shared_client_session> shared_client_;
   std::auto_ptr<nsclient_session::shared_server_session> shared_server_;
+  */
   log_cache_type log_cache_;
   bool plugins_loaded_;