Changeset c0522cd in nscp

Timestamp:

08/24/08 19:23:10 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

bc97cd8

Parents:

846bbe4

Message:

2008-08-16 MickeM

• *WARNING* THIS IS VERY VERY UNSTABEL (possibly)
• *WARNING* A lot of new untested code here so dont run in production enviornments :) + Added shared session so system tray can communicate with master + Added new system tray handlig (via TS so FUS should work with it) + Added new option [System] / shared_session=0 (or 1) to enable / disable the new shared memory framework (it is for now disabled by default) If you want to try this remember to change that option but also beware! it is dagerous and not finnished and and also there is as of now no security at all.

Files:

• AutoBuild.h (modified) (1 diff)
• NSC.dist (modified) (2 diffs)
• NSCPlugin.cpp (modified) (6 diffs)
• NSCPlugin.h (modified) (3 diffs)
• NSClient++-2005.sln (modified) (17 diffs)
• NSClient++-2005.vcproj (modified) (13 diffs)
• NSClient++.cpp (modified) (36 diffs)
• NSClient++.h (modified) (5 diffs)
• changelog (modified) (1 diff)
• helpers/UploadBinaries/UploadBinaries.vcproj (modified) (1 diff)
• helpers/UploadInstaller/UploadInstaller.vcproj (modified) (1 diff)
• helpers/systray_helper/ReadMe.txt (added)
• helpers/systray_helper/Resource.h (added)
• helpers/systray_helper/TrayWidget.cpp (added)
• helpers/systray_helper/TrayWidget.h (added)
• helpers/systray_helper/stdafx.cpp (added)
• helpers/systray_helper/stdafx.h (added)
• helpers/systray_helper/systray_helper.cpp (added)
• helpers/systray_helper/systray_helper.h (added)
• helpers/systray_helper/systray_helper.rc (added)
• helpers/systray_helper/systray_helper.vcproj (added)
• include/Mutex.h (modified) (8 diffs)
• include/NSCHelper.cpp (modified) (3 diffs)
• include/NSCHelper.h (modified) (3 diffs)
• include/NTService.h (modified) (6 diffs)
• include/ServiceCmd.cpp (modified) (1 diff)
• include/config.h (modified) (3 diffs)
• include/event_handler.hpp (added)
• include/file_logger.hpp (added)
• include/nsclient_session.hpp (added)
• include/remote_processes.hpp (added)
• include/shared_memory.hpp (added)
• include/strEx.h (modified) (4 diffs)
• modules/CheckDisk/CheckDisk-2005.vcproj (modified) (2 diffs)
• modules/CheckEventLog/CheckEventLog-2005.vcproj (modified) (2 diffs)
• modules/CheckExternalScripts/CheckExternalScripts-2005.vcproj (modified) (2 diffs)
• modules/CheckHelpers/CheckHelpers-2005.vcproj (modified) (2 diffs)
• modules/CheckSystem/CheckSystem-2005.vcproj (modified) (2 diffs)
• modules/CheckTaskSched/CheckTaskSched-2005.vcproj (modified) (6 diffs)
• modules/CheckWMI/CheckWMI-2005.vcproj (modified) (2 diffs)
• modules/FileLogger/FileLogger-2005.vcproj (modified) (2 diffs)
• modules/LUAScript/LUAScript-2005.vcproj (modified) (2 diffs)
• modules/NRPEClient/NRPEClient-2005.vcproj (modified) (2 diffs)
• modules/NRPEListener/NRPEListener-2005.vcproj (modified) (2 diffs)
• modules/NSCAAgent/NSCAAgent-2005.vcproj (modified) (2 diffs)
• modules/NSClientListener/NSClientListener-2005.vcproj (modified) (2 diffs)
• modules/RemoteConfiguration/RemoteConfiguration-2005.vcproj (modified) (2 diffs)
• modules/SysTray/SysTray-2005.vcproj (modified) (2 diffs)
• modules/SysTray/SysTray.cpp (modified) (5 diffs)
• modules/SysTray/SysTray.def (modified) (1 diff)
• modules/SysTray/SysTray.h (modified) (2 diffs)
• modules/SysTray/SysTray.rc (modified) (2 diffs)
• modules/SysTray/TrayIcon.cpp (modified) (3 diffs)
• tray_manager.hpp (added)

AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,3,29
-#define PRODUCTVER     0,3,3,29
-#define STRFILEVER     _T("0.3.3.29")
-#define STRPRODUCTVER  _T("0.3.3.29")
-#define STRPRODUCTDATE  _T("2008-07-28")
+#define FILEVER        0,3,3,37
+#define PRODUCTVER     0,3,3,37
+#define STRFILEVER     _T("0.3.3.37")
+#define STRPRODUCTVER  _T("0.3.3.37")
+#define STRPRODUCTDATE  _T("2008-08-24")
 #endif // AUTOBUILD_H

NSC.dist

@@ -54 +54 @@
 ;  the registry will be used instead.
 use_file=1
+;
+; # USE SHARED MEMORY CHANNELS
+;  This is the "new" way for using the system tray based on an IPC framework on top shared memmory channels and events.
+;  It is brand new and (probably has bugs) so dont enable this unless for testing!
+;  If set to 1 shared channels will be created and system tray icons created and such and such...
+;shared_session=0
+
 
 [log]
@@ -62 +69 @@
 ;# LOG FILE
 ;  The file to print log statements to
-;file=NSC.log
+;file=nsclient.log
 ;
 ;# LOG DATE MASK
 ;  The format to for the date/time part of the log entry written to file.
 ;date_mask=%Y-%m-%d %H:%M:%S
+;
+;# LOG ROOT FOLDER
+;  The root folder to use for logging.
+;  exe = the folder where the executable is located
+;  local-app-data = local application data (probably a better choice then the old default)
+;root_folder=exe
 
 

NSCPlugin.cpp

@@ -42 +42 @@
   ,fGetVersion(NULL)
   ,fCommandLineExec(NULL)
+  ,fShowTray(NULL)
+  ,fHideTray(NULL)
   ,bLoaded_(false)
 {
@@ -58 +60 @@
   ,fGetVersion(NULL)
   ,fCommandLineExec(NULL)
+  ,fShowTray(NULL)
+  ,fHideTray(NULL)
   ,bLoaded_(false)
 {
@@ -89 +93 @@
   TCHAR *buffer = new TCHAR[1024];
   if (!getName_(buffer, 1023)) {
-    throw NSPluginException(file_, _T("Could not get name"));
+    return _T("Could not get name");
   }
   std::wstring ret = buffer;
@@ -244 +248 @@
 bool NSCPlugin::getName_(TCHAR* buf, unsigned int buflen) {
   if (fGetName == NULL)
-    throw NSPluginException(file_, _T("Critical error (fGetName)"));
+    return false;//throw NSPluginException(file_, _T("Critical error (fGetName)"));
   try {
     return fGetName(buf, buflen)?true:false;
   } catch (...) {
-    throw NSPluginException(file_, _T("Unhandled exception in getName."));
+    return false; //throw NSPluginException(file_, _T("Unhandled exception in getName."));
   }
 }
@@ -260 +264 @@
   }
 }
+
+void NSCPlugin::showTray() {
+  if (fShowTray == NULL)
+    throw NSPluginException(file_, _T("Critical error (ShowTray)"));
+  try {
+    fShowTray();
+  } catch (...) {
+    throw NSPluginException(file_, _T("Unhandled exception in ShowTray."));
+  }
+}
+void NSCPlugin::hideTray() {
+  if (fHideTray == NULL)
+    throw NSPluginException(file_, _T("Critical error (HideTray)"));
+  try {
+    fHideTray();
+  } catch (...) {
+    throw NSPluginException(file_, _T("Unhandled exception in HideTray."));
+  }
+}
+
 /**
  * Load all remote function pointers from the loaded module.
@@ -316 +340 @@
   fGetConfigurationMeta = (lpGetConfigurationMeta)GetProcAddress(hModule_, "NSGetConfigurationMeta");
   fCommandLineExec = (lpCommandLineExec)GetProcAddress(hModule_, "NSCommandLineExec");
+
+  fShowTray = (lpShowTray)GetProcAddress(hModule_, "ShowIcon");
+  fHideTray = (lpHideTray)GetProcAddress(hModule_, "HideIcon");
+
 }
 

NSCPlugin.h

@@ -107 +107 @@
   typedef INT (*lpUnLoadModule)();
   typedef INT (*lpGetConfigurationMeta)(int, TCHAR*);
+  typedef void (*lpShowTray)();
+  typedef void (*lpHideTray)();
 
 
@@ -121 +123 @@
   lpGetConfigurationMeta fGetConfigurationMeta;
   lpCommandLineExec fCommandLineExec;
+  lpShowTray fShowTray;
+  lpHideTray fHideTray;
 
 public:
@@ -139 +143 @@
   std::wstring getCongifurationMeta();
   int commandLineExec(const TCHAR* command, const unsigned int argLen, TCHAR **arguments);
+  void showTray();
+  void hideTray();
+
   std::wstring getModule() {
     if (file_.empty())

NSClient++-2005.sln

@@ -6 +6 @@
     Release.AspNetCompiler.Debug = "False"
   EndProjectSection
-  ProjectSection(ProjectDependencies) = postProject
-    {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A}
-    {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B}
-    {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24}
-    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45} = {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}
-    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0} = {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}
-    {6F55C9BF-57F6-4A15-A058-C83A52F539EE} = {6F55C9BF-57F6-4A15-A058-C83A52F539EE}
-    {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996} = {4241C6CF-EC01-4AD9-89B0-B75EBA8A5996}
-    {26B84883-BE52-40E6-9BEE-55AD056D5751} = {26B84883-BE52-40E6-9BEE-55AD056D5751}
-    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}
-    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}
-    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}
-    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}
-    {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8}
-    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F} = {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}
-    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6} = {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}
-  EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SysTray", "modules\SysTray\SysTray-2005.vcproj", "{BBFF8362-C626-4838-B0A2-F695D638AD24}"
@@ -157 +140 @@
   ProjectSection(ProjectDependencies) = postProject
     {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D}
+    {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20}
   EndProjectSection
 EndProject
@@ -175 +159 @@
   EndProjectSection
   ProjectSection(ProjectDependencies) = postProject
+    {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20}
     {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D}
   EndProjectSection
@@ -191 +176 @@
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CheckTaskSched", "modules\CheckTaskSched\CheckTaskSched-2005.vcproj", "{F3401E75-60FB-4A0E-A18C-6505587D5B1A}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "systray_helper", "helpers\systray_helper\systray_helper.vcproj", "{43718644-173B-42D8-8AD1-E359BFB2BB20}"
   ProjectSection(WebsiteProperties) = preProject
     Debug.AspNetCompiler.Debug = "True"
@@ -262 +253 @@
     {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Release|Win32.ActiveCfg = Release|Win32
     {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Release|Win32.Build.0 = Release|Win32
-    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Release|x64.ActiveCfg = Release|Win32
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Release|x64.ActiveCfg = Release|x64
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D}.Release|x64.Build.0 = Release|x64
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.Debug|Any CPU.ActiveCfg = Debug|x64
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.Debug|Itanium.ActiveCfg = Debug|x64
@@ -300 +292 @@
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.Release|Win32.ActiveCfg = Release|Win32
     {BBFF8362-C626-4838-B0A2-F695D638AD24}.Release|Win32.Build.0 = Release|Win32
-    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Release|x64.ActiveCfg = Release|Win32
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Release|x64.ActiveCfg = Release|x64
+    {BBFF8362-C626-4838-B0A2-F695D638AD24}.Release|x64.Build.0 = Release|x64
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug|Any CPU.ActiveCfg = Debug|x64
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Debug|Itanium.ActiveCfg = Debug|x64
@@ -338 +331 @@
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Release|Win32.ActiveCfg = Release|Win32
     {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Release|Win32.Build.0 = Release|Win32
-    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Release|x64.ActiveCfg = Release|Win32
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Release|x64.ActiveCfg = Release|x64
+    {62B685D7-3A2E-4F3E-B2B8-B17F20C0217F}.Release|x64.Build.0 = Release|x64
     {BA246C01-063A-4548-8957-32D5CC76171B}.Debug|Any CPU.ActiveCfg = Debug|x64
     {BA246C01-063A-4548-8957-32D5CC76171B}.Debug|Itanium.ActiveCfg = Debug|x64
@@ -376 +370 @@
     {BA246C01-063A-4548-8957-32D5CC76171B}.Release|Win32.ActiveCfg = Release|Win32
     {BA246C01-063A-4548-8957-32D5CC76171B}.Release|Win32.Build.0 = Release|Win32
-    {BA246C01-063A-4548-8957-32D5CC76171B}.Release|x64.ActiveCfg = Release|Win32
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Release|x64.ActiveCfg = Release|x64
+    {BA246C01-063A-4548-8957-32D5CC76171B}.Release|x64.Build.0 = Release|x64
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug|Any CPU.ActiveCfg = Debug|x64
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Debug|Itanium.ActiveCfg = Debug|x64
@@ -414 +409 @@
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Release|Win32.ActiveCfg = Release|Win32
     {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Release|Win32.Build.0 = Release|Win32
-    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Release|x64.ActiveCfg = Release|Win32
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Release|x64.ActiveCfg = Release|x64
+    {E6E588AB-EFEF-481C-9AF7-DCDCB95CFF45}.Release|x64.Build.0 = Release|x64
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug|Any CPU.ActiveCfg = Debug|x64
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Debug|Itanium.ActiveCfg = Debug|x64
@@ -452 +448 @@
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Release|Win32.ActiveCfg = Release|Win32
     {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Release|Win32.Build.0 = Release|Win32
-    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Release|x64.ActiveCfg = Release|Win32
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Release|x64.ActiveCfg = Release|x64
+    {2FF60AF6-09AA-49AB-B414-2E8FD01655C6}.Release|x64.Build.0 = Release|x64
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug|Any CPU.ActiveCfg = Debug|x64
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Debug|Itanium.ActiveCfg = Debug|x64
@@ -490 +487 @@
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Release|Win32.ActiveCfg = Release|Win32
     {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Release|Win32.Build.0 = Release|Win32
-    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Release|x64.ActiveCfg = Release|Win32
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Release|x64.ActiveCfg = Release|x64
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8}.Release|x64.Build.0 = Release|x64
     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug|Any CPU.ActiveCfg = Debug|x64
     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Debug|Itanium.ActiveCfg = Debug|x64
@@ -528 +526 @@
     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Release|Win32.ActiveCfg = Release|Win32
     {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Release|Win32.Build.0 = Release|Win32
-    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Release|x64.ActiveCfg = Release|Win32
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Release|x64.ActiveCfg = Release|x64
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}.Release|x64.Build.0 = Release|x64
     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Debug|Any CPU.ActiveCfg = Debug|x64
     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Debug|Itanium.ActiveCfg = Debug|x64
@@ -566 +565 @@
     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Release|Win32.ActiveCfg = Release|Win32
     {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Release|Win32.Build.0 = Release|Win32
-    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Release|x64.ActiveCfg = Release|Win32
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Release|x64.ActiveCfg = Release|x64
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}.Release|x64.Build.0 = Release|x64
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug|Any CPU.ActiveCfg = Debug|x64
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Debug|Itanium.ActiveCfg = Debug|x64
@@ -604 +604 @@
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Release|Win32.ActiveCfg = Release|Win32
     {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Release|Win32.Build.0 = Release|Win32
-    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Release|x64.ActiveCfg = Release|Win32
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Release|x64.ActiveCfg = Release|x64
+    {05DE66AC-E55C-43B3-849F-7EC695D8B8D0}.Release|x64.Build.0 = Release|x64
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug|Any CPU.ActiveCfg = Debug|x64
     {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}.Debug|Itanium.ActiveCfg = Debug|x64
@@ -1039 +1040 @@
     {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Release|Win32.Build.0 = Release|Win32
     {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Release|x64.ActiveCfg = Release|x64
-    {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Release|x64.Build.0 = Release|x64
     {19BF0AD8-0013-46C7-9E91-F60FE3B0A63D}.Debug|Any CPU.ActiveCfg = Debug|Win32
     {19BF0AD8-0013-46C7-9E91-F60FE3B0A63D}.Debug|Itanium.ActiveCfg = Debug|Win32
@@ -1114 +1114 @@
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Release|x64.ActiveCfg = Release|x64
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Release|x64.Build.0 = Release|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug|Any CPU.ActiveCfg = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug|Itanium.ActiveCfg = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug|Win32.ActiveCfg = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug|Win32.Build.0 = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug|x64.ActiveCfg = Debug|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug|x64.Build.0 = Debug|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug-MemCheck|Any CPU.ActiveCfg = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug-MemCheck|Itanium.ActiveCfg = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug-MemCheck|Mixed Platforms.ActiveCfg = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug-MemCheck|Mixed Platforms.Build.0 = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug-MemCheck|Win32.ActiveCfg = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug-MemCheck|Win32.Build.0 = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Debug-MemCheck|x64.ActiveCfg = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Distribution|Any CPU.ActiveCfg = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Distribution|Itanium.ActiveCfg = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Distribution|Mixed Platforms.ActiveCfg = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Distribution|Mixed Platforms.Build.0 = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Distribution|Win32.ActiveCfg = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Distribution|Win32.Build.0 = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Distribution|x64.ActiveCfg = Debug|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Nightly|Any CPU.ActiveCfg = Release|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Nightly|Itanium.ActiveCfg = Release|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Nightly|Mixed Platforms.ActiveCfg = Release|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Nightly|Mixed Platforms.Build.0 = Release|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Nightly|Win32.ActiveCfg = Nightly|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Nightly|Win32.Build.0 = Nightly|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Nightly|x64.ActiveCfg = Nightly|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Nightly|x64.Build.0 = Nightly|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Release|Any CPU.ActiveCfg = Release|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Release|Itanium.ActiveCfg = Release|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Release|Mixed Platforms.Build.0 = Release|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Release|Win32.ActiveCfg = Release|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Release|Win32.Build.0 = Release|Win32
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Release|x64.ActiveCfg = Release|x64
+    {43718644-173B-42D8-8AD1-E359BFB2BB20}.Release|x64.Build.0 = Release|x64
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution
@@ -1135 +1173 @@
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {9757464B-C125-4307-A84A-F4181AE6A081}
     {0E2B21D9-F432-4127-8E92-7716B1072510} = {9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}
-    {A3CF4E23-1D1B-4D93-A16A-48C52D118560} = {9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}
     {6206F046-3D36-4258-BB03-3291A7070117} = {9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}
     {D96F7075-F6CD-4921-B5D8-8488E2D24BDB} = {9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}

NSClient++-2005.vcproj

@@ -38 +38 @@
       <Tool
         Name="VCCustomBuildTool"
-        CommandLine=""
+        CommandLine="&#x0D;&#x0A;"
         Outputs="$(InputDir)\$(OutDir)\msvcp71.dll"
       />
@@ -85 +85 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="kernel32.lib user32.lib advapi32.lib ws2_32.lib"
+        AdditionalDependencies="kernel32.lib user32.lib advapi32.lib ws2_32.lib Userenv.lib"
         OutputFile=".\Release/NSClient++.exe"
         LinkIncremental="1"
@@ -139 +139 @@
       <Tool
         Name="VCCustomBuildTool"
-        CommandLine="echo Copying dependency DLLs&#x0D;&#x0A;cmd /c &quot;copy $(InputDir)\dist_dll\*.* $(InputDir)\$(OutDir)\&quot;&#x0D;&#x0A;"
+        CommandLine="&#x0D;&#x0A;"
         Outputs="$(InputDir)\$(OutDir)\msvcp71.dll"
       />
@@ -187 +187 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib Pdh.lib"
+        AdditionalDependencies="kernel32.lib user32.lib advapi32.lib ws2_32.lib Userenv.lib"
         OutputFile=".\Release/NSClient++.exe"
         LinkIncremental="1"
@@ -283 +283 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib"
+        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib Userenv.lib"
         OutputFile=".\Debug/NSClient++.exe"
         LinkIncremental="1"
@@ -378 +378 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib"
+        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib Userenv.lib"
         OutputFile=".\Debug/NSClient++.exe"
         LinkIncremental="1"
@@ -669 +669 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib"
+        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib Userenv.lib"
         LinkIncremental="1"
         SuppressStartupBanner="true"
@@ -757 +757 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib"
+        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib Userenv.lib"
         LinkIncremental="1"
         SuppressStartupBanner="true"
@@ -2377 +2377 @@
       </File>
       <File
+        RelativePath=".\include\event_handler.hpp"
+        >
+      </File>
+      <File
         RelativePath=".\include\INISettings.h"
         >
@@ -2401 +2405 @@
       </File>
       <File
+        RelativePath=".\include\nsclient_session.hpp"
+        >
+      </File>
+      <File
         RelativePath=".\NSCPlugin.h"
         >
@@ -2417 +2425 @@
       </File>
       <File
+        RelativePath=".\include\remote_processes.hpp"
+        >
+      </File>
+      <File
         RelativePath=".\include\ServiceCmd.h"
         >
@@ -2425 +2437 @@
       </File>
       <File
+        RelativePath=".\include\shared_memory.hpp"
+        >
+      </File>
+      <File
         RelativePath=".\include\Singleton.h"
         >
@@ -2442 +2458 @@
       <File
         RelativePath=".\include\thread.h"
+        >
+      </File>
+      <File
+        RelativePath=".\tray_manager.hpp"
         >
       </File>

NSClient++.cpp

@@ -1 @@
-//////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
 // NSClient++ Base Service
 // 
@@ -22 +22 @@
 #include <config.h>
 #include <msvc_wrappers.h>
-
+#include <Userenv.h>
+#include <remote_processes.hpp>
+#include <Lmcons.h>
 
 NSClient mainClient;  // Global core instance.
 bool g_bConsoleLog = false;
+
+
+class tray_starter {
+  struct start_block {
+    std::wstring cmd;
+    std::wstring cmd_line;
+    DWORD sessionId;
+  };
+
+public:
+  static LPVOID init(DWORD dwSessionId, std::wstring exe, std::wstring cmdline) {
+    start_block *sb = new start_block;
+    sb->cmd = exe;
+    sb->cmd_line = cmdline;
+    sb->sessionId = dwSessionId;
+    return sb;
+  }
+  DWORD threadProc(LPVOID lpParameter) {
+    start_block* param = static_cast<start_block*>(lpParameter);
+    DWORD dwSessionId = param->sessionId;
+    std::wstring cmd = param->cmd;
+    std::wstring cmdline = param->cmd_line;
+    delete param;
+    for (int i=0;i<10;i++) {
+      Sleep(1000);
+      if (startTrayHelper(dwSessionId, cmd, cmdline, false))
+        break;
+    }
+    return 0;
+  }
+
+  static bool start(DWORD dwSessionId) {
+    std::wstring program = mainClient.getBasePath() +  _T("\\") + Settings::getInstance()->getString(NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_SYSTRAY_EXE, NSCLIENT_SETTINGS_SYSTRAY_EXE_DEFAULT);
+    std::wstring cmdln = _T("\"") + program + _T("\" -channel __") + strEx::itos(dwSessionId) + _T("__");
+    return tray_starter::startTrayHelper(dwSessionId, program, cmdln);
+  }
+
+  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;
+    }
+  }
+};
+
+
+
+
 
 /**
@@ -62 +199 @@
         return -1;
       }
+      LOG_MESSAGE(_T("Service uninstalled!"));
     } else if ( _wcsicmp( _T("encrypt"), argv[1]+1 ) == 0 ) {
       g_bConsoleLog = true;
@@ -104 +242 @@
       LOG_MESSAGE(SZAPPNAME _T(" Version: ") SZVERSION _T(", Plattform: ") SZARCH);
     } else if ( _wcsicmp( _T("noboot"), argv[1]+1 ) == 0 ) {
-      mainClient.setBoot(false);
       g_bConsoleLog = false;
       mainClient.enableDebug(true);
-      mainClient.InitiateService();
+      mainClient.initCore(false);
       int nRetCode = -1;
       if (argc>=4)
@@ -113 +250 @@
       else if (argc>=3)
         nRetCode = mainClient.commandLineExec(argv[2], argv[3], 0, NULL);
-      mainClient.TerminateService();
+      mainClient.exitCore(false);
       return nRetCode;
     } else if ( _wcsicmp( _T("test"), argv[1]+1 ) == 0 ) {
-      std::wcout << "Launching test mode..." << std::endl;
+      bool server = false;
+      if (argc > 2 && _wcsicmp( _T("server"), argv[2] ) == 0 ) {
+        server = true;
+      }
+      std::wcout << "Launching test mode - " << (server?_T("server mode"):_T("client mode")) << std::endl;
       LOG_MESSAGE_STD(_T("Booting: " SZSERVICEDISPLAYNAME ));
       try {
@@ -123 +264 @@
         }
       } catch (const serviceControll::SCException& e) {
-        // Empty by design
+        e;// Empty by design
       }
       g_bConsoleLog = true;
       mainClient.enableDebug(true);
-      if (!mainClient.InitiateService()) {
+      if (!mainClient.initCore(true)) {
         LOG_ERROR_STD(_T("Service *NOT* started!"));
         return -1;
       }
+      if (server)
+        mainClient.startTrayIcon(0);
       LOG_MESSAGE_STD(_T("Using settings from: ") + Settings::getInstance()->getActiveType());
       LOG_MESSAGE(_T("Enter command to inject or exit to terminate..."));
@@ -147 +290 @@
           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);
         } else if (std::cin.peek() < 15) {
           buff += s;
@@ -166 +312 @@
         }
       }
-      mainClient.TerminateService();
+      mainClient.exitCore(true);
       return 0;
     } else {
@@ -176 +322 @@
   } else if (argc > 2) {
     g_bConsoleLog = true;
-    mainClient.InitiateService();
+    mainClient.initCore(true);
     if (argc>=3)
       nRetCode = mainClient.commandLineExec(argv[1], argv[2], argc-3, &argv[3]);
     else
       nRetCode = mainClient.commandLineExec(argv[1], argv[2], 0, NULL);
-    mainClient.TerminateService();
+    mainClient.exitCore(true);
     return nRetCode;
   } else if (argc > 1) {
@@ -198 +344 @@
 }
 
+void NSClientT::session_error(std::wstring file, unsigned int line, std::wstring msg) {
+  NSAPIMessage(NSCAPI::error, file.c_str(), line, msg.c_str());
+}
+
+
+
+
 //////////////////////////////////////////////////////////////////////////
 // Service functions
 
 /**
- * Service control handler startup point.
- * When the program is started as a service this will be the entry point.
+ * Initialize the program
+ * @param boot true if we shall boot all plugins
+ * @param attachIfPossible is true we will attach to a running instance.
+ * @return success
+ * @author mickem
  */
-bool NSClientT::InitiateService() {
+bool NSClientT::initCore(bool boot) {
+  LOG_MESSAGE(_T("Attempting to start NSCLient++ - " SZVERSION));
   try {
     Settings::getInstance()->setFile(getBasePath(), _T("NSC.ini"));
@@ -211 +368 @@
       Settings::getInstance()->setInt(_T("log"), _T("debug"), 1);
     }
+    if (enable_shared_session_)
+      Settings::getInstance()->setInt(MAIN_SECTION_TITLE, MAIN_SHARED_SESSION, 1);
+    enable_shared_session_ = Settings::getInstance()->getInt(MAIN_SECTION_TITLE, MAIN_SHARED_SESSION, MAIN_SHARED_SESSION_DEFAULT);
   } catch (SettingsException e) {
     LOG_ERROR_STD(_T("Could not find settings: ") + e.getMessage());
@@ -217 +377 @@
     LOG_ERROR_STD(_T("Unknown exception reading settings..."));
     return false;
+  }
+
+  if (enable_shared_session_) {
+    if (boot) {
+      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_ = NULL;
+      } catch (...) {
+        LOG_ERROR_STD(_T("Failed to create new session: Unknown exception"));
+        shared_server_ = NULL;
+      }
+    } else {
+      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_ = NULL;
+      } catch (...) {
+        LOG_ERROR_STD(_T("Failed to attach to session: Unknown exception"));
+        shared_client_ = NULL;
+      }
+    }
   }
 
@@ -238 +435 @@
     return false;
   }
-  if (boot_) {
+  if (boot) {
     try {
       SettingsT::sectionList list = Settings::getInstance()->getSection(_T("modules"));
@@ -256 +453 @@
       }
     } catch (SettingsException e) {
-      NSC_LOG_ERROR_STD(_T("Failed to set settings file") + e.getMessage());
+      LOG_ERROR_STD(_T("Failed to set settings file") + e.getMessage());
     } catch (...) {
       LOG_ERROR_STD(_T("Unknown exception when loading settings"));
@@ -268 +465 @@
     }
   }
+  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;
+}
+
+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);
+      }
+    }
+  }
+}
+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());
+    }
+  }
+}
+
+bool NSClientT::exitCore(bool boot) {
+  LOG_MESSAGE(_T("Attempting to stop NSCLient++ - " SZVERSION));
+  if (boot) {
+    try {
+      LOG_DEBUG_STD(_T("Stopping: NON Message Handling Plugins"));
+      mainClient.unloadPlugins(false);
+    } catch(NSPluginException e) {
+      std::wcout << _T("Exception raised: ") << e.error_ << _T(" in module: ") << e.file_ << std::endl;;
+    } catch(...) {
+      std::wcout << _T("UNknown exception raised: ") << std::endl;;
+    }
+  }
+  LOG_DEBUG_STD(_T("Stopping: COM helper"));
+  try {
+    com_helper_.unInitialize();
+  } catch (com_helper::com_exception e) {
+    LOG_ERROR_STD(_T("COM exception: ") + e.getMessage());
+  } catch (...) {
+    LOG_ERROR_STD(_T("Unknown exception uniniating COM..."));
+  }
+  LOG_DEBUG_STD(_T("Stopping: Socket Helpers"));
+  try {
+    simpleSocket::WSACleanup();
+  } catch (simpleSocket::SocketException e) {
+    LOG_ERROR_STD(_T("Socket exception: ") + e.getMessage());
+  } catch (...) {
+    LOG_ERROR_STD(_T("Unknown exception uniniating socket..."));
+  }
+  LOG_DEBUG_STD(_T("Stopping: Settings instance"));
+  Settings::destroyInstance();
+  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) {
+    std::wcout << _T("Exception closing shared client session: ") << e.what() << std::endl;;
+  } catch(...) {
+    std::wcout << _T("Exception closing shared client session: Unknown exception!") << std::endl;;
+  }
+  try {
+    if (shared_server_.get() != NULL) {
+      LOG_DEBUG_STD(_T("Stopping: shared server"));
+      shared_server_->set_handler(NULL);
+      shared_server_->close_session();
+    }
+  } catch(...) {
+    std::wcout << _T("UNknown exception raised: ") << std::endl;;
+  }
+  if (boot) {
+    try {
+      LOG_DEBUG_STD(_T("Stopping: Message handling Plugins"));
+      mainClient.unloadPlugins(true);
+    } catch(NSPluginException e) {
+      std::wcout << _T("Exception raised: ") << e.error_ << _T(" in module: ") << e.file_ << std::endl;;
+    } catch(...) {
+      std::wcout << _T("UNknown exception raised: ") << std::endl;;
+    }
+  }
+  LOG_MESSAGE_STD(_T("NSCLient++ - " SZVERSION) + _T(" Stopped succcessfully"));
   return true;
 }
@@ -275 +585 @@
  */
 void NSClientT::TerminateService(void) {
-  if (boot_) {
-    try {
-      mainClient.unloadPlugins();
-    } catch(NSPluginException e) {
-      std::wcout << _T("Exception raised: ") << e.error_ << _T(" in module: ") << e.file_ << std::endl;;
-    } catch(...) {
-      std::wcout << _T("UNknown exception raised: ") << std::endl;;
-    }
-  }
-  try {
-    com_helper_.unInitialize();
-  } catch (com_helper::com_exception e) {
-    LOG_ERROR_STD(_T("COM exception: ") + e.getMessage());
-  } catch (...) {
-    LOG_ERROR_STD(_T("Unknown exception uniniating COM..."));
-  }
-  try {
-    simpleSocket::WSACleanup();
-  } catch (simpleSocket::SocketException e) {
-    LOG_ERROR_STD(_T("Socket exception: ") + e.getMessage());
-  } catch (...) {
-    LOG_ERROR_STD(_T("Unknown exception uniniating socket..."));
-  }
-  Settings::destroyInstance();
+  exitCore(true);
 }
 
@@ -309 +596 @@
   mainClient.service_main(dwArgc, lpszArgv);
 }
+DWORD WINAPI NSClientT::service_ctrl_dispatch_ex(DWORD dwControl, DWORD dwEventType, LPVOID lpEventData, LPVOID lpContext) {
+  LOG_ERROR_STD(_T("service_ctrl_dispatch_ex dispatching event: ") + strEx::itos(dwControl));
+  return mainClient.service_ctrl_ex(dwControl, dwEventType, lpEventData, lpContext);
+}
+
 /**
  * Forward this to the main service dispatcher helper class
@@ -314 +606 @@
  */
 void WINAPI NSClientT::service_ctrl_dispatch(DWORD dwCtrlCode) {
-  mainClient.service_ctrl(dwCtrlCode);
-}
+  LOG_ERROR_STD(_T("service_ctrl_dispatch dispatching event: ") + strEx::itos(dwCtrlCode));
+  mainClient.service_ctrl_ex(dwCtrlCode, NULL, NULL, NULL);
+}
+
+
+void NSClientT::service_on_session_changed(DWORD dwSessionId, bool logon, DWORD dwEventType) {
+  LOG_MESSAGE_STD(_T("Got session change: ") + strEx::itos(dwSessionId));
+  if (!logon) {
+    LOG_MESSAGE_STD(_T("Not a logon event: ") + strEx::itos(dwEventType));
+    return;
+  }
+  tray_starter::start(dwSessionId);
+}
+
 
 //////////////////////////////////////////////////////////////////////////
@@ -383 +687 @@
  * Unload all plug-ins (in reversed order)
  */
-void NSClientT::unloadPlugins() {
+void NSClientT::unloadPlugins(bool unloadLoggers) {
   {
     WriteLock writeLock(&m_mutexRW, true, 10000);
@@ -391 +695 @@
     }
     commandHandlers_.clear();
-    messageHandlers_.clear();
+    if (unloadLoggers)
+      messageHandlers_.clear();
   }
   {
@@ -401 +706 @@
     for (pluginList::size_type i=plugins_.size();i>0;i--) {
       NSCPlugin *p = plugins_[i-1];
-      LOG_DEBUG_STD(_T("Unloading plugin: ") + p->getName() + _T("..."));
+      if (!unloadLoggers && p->hasMessageHandler()) {
+        LOG_DEBUG_STD(_T("Skipping log plugin: ") + p->getModule() + _T("..."));
+        continue;
+      }
+      LOG_DEBUG_STD(_T("Unloading plugin: ") + p->getModule() + _T("..."));
       p->unload();
     }
@@ -413 +722 @@
     for (pluginList::size_type i=plugins_.size();i>0;i--) {
       NSCPlugin *p = plugins_[i-1];
-      plugins_[i-1] = NULL;
-      delete p;
-    }
-    plugins_.clear();
+      if (unloadLoggers || !p->hasMessageHandler()) {
+        LOG_DEBUG_STD(_T("Deleating plugin instance: ") + p->getModule() + _T("..."));
+        plugins_[i-1] = NULL;
+        delete p;
+        plugins_.erase(plugins_.begin() + i-1);
+        --i;
+      }
+    }
+    //plugins_.clear();
   }
 }
@@ -430 +744 @@
     (*it)->load_plugin();
   }
+  plugins_loaded_ = true;
 }
 /**
@@ -498 +813 @@
       len = Settings::getInstance()->getInt(MAIN_SECTION_TITLE, MAIN_STRING_LENGTH, MAIN_STRING_LENGTH_DEFAULT);
     } catch (SettingsException &e) {
-      NSC_DEBUG_MSG(_T("Failed to get length: ") + e.getMessage());
+      LOG_DEBUG_STD(_T("Failed to get length: ") + e.getMessage());
       return MAIN_STRING_LENGTH_DEFAULT;
     } catch (...) {
-      NSC_LOG_ERROR(_T("Failed to get length: :("));
+      LOG_ERROR(_T("Failed to get length: :("));
       return MAIN_STRING_LENGTH_DEFAULT;
     }
@@ -509 +824 @@
 
 NSCAPI::nagiosReturn NSClientT::inject(std::wstring command, std::wstring arguments, TCHAR splitter, bool escape, std::wstring &msg, std::wstring & perf) {
-  unsigned int aLen = 0;
-  TCHAR ** aBuf = arrayBuffer::split2arrayBuffer(arguments, splitter, aLen, escape);
-  unsigned int buf_len = getBufferLength();
-  TCHAR * mBuf = new TCHAR[buf_len+1]; mBuf[0] = '\0';
-  TCHAR * pBuf = new TCHAR[buf_len+1]; pBuf[0] = '\0';
-  NSCAPI::nagiosReturn ret = injectRAW(command.c_str(), aLen, aBuf, mBuf, buf_len, pBuf, buf_len);
-  arrayBuffer::destroyArrayBuffer(aBuf, aLen);
-  if ( (ret == NSCAPI::returnInvalidBufferLen) || (ret == NSCAPI::returnIgnored) ) {
+  if (shared_client_.get() != NULL && shared_client_->hasMaster()) {
+    try {
+      return shared_client_->inject(command, arguments, splitter, escape, msg, perf);
+    } catch (nsclient_session::session_exception &e) {
+      LOG_ERROR_STD(_T("Failed to inject remote command: ") + e.what());
+      return NSCAPI::returnCRIT;
+    } catch (...) {
+      LOG_ERROR_STD(_T("Failed to inject remote command: Unknown exception"));
+      return NSCAPI::returnCRIT;
+    }
+  } else {
+    unsigned int aLen = 0;
+    TCHAR ** aBuf = arrayBuffer::split2arrayBuffer(arguments, splitter, aLen, escape);
+    unsigned int buf_len = getBufferLength();
+    TCHAR * mBuf = new TCHAR[buf_len+1]; mBuf[0] = '\0';
+    TCHAR * pBuf = new TCHAR[buf_len+1]; pBuf[0] = '\0';
+    NSCAPI::nagiosReturn ret = injectRAW(command.c_str(), aLen, aBuf, mBuf, buf_len, pBuf, buf_len);
+    arrayBuffer::destroyArrayBuffer(aBuf, aLen);
+    if ( (ret == NSCAPI::returnInvalidBufferLen) || (ret == NSCAPI::returnIgnored) ) {
+      delete [] mBuf;
+      delete [] pBuf;
+      return ret;
+    }
+    msg = mBuf;
+    perf = pBuf;
     delete [] mBuf;
     delete [] pBuf;
     return ret;
   }
-  msg = mBuf;
-  perf = pBuf;
-  delete [] mBuf;
-  delete [] pBuf;
-  return ret;
 }
 
@@ -544 +871 @@
     LOG_DEBUG_STD(_T("Injecting: ") + (std::wstring) command + _T(": ") + arrayBuffer::arrayBuffer2string(argument, argLen, _T(", ")));
   }
-  ReadLock readLock(&m_mutexRW, true, 5000);
-  if (!readLock.IsLocked()) {
-    LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
-    return NSCAPI::returnUNKNOWN;
-  }
-  for (pluginList::size_type i = 0; i < commandHandlers_.size(); i++) {
+  if (shared_client_.get() != NULL && shared_client_->hasMaster()) {
     try {
-      NSCAPI::nagiosReturn c = commandHandlers_[i]->handleCommand(command, argLen, argument, returnMessageBuffer, returnMessageBufferLen, returnPerfBuffer, returnPerfBufferLen);
-      switch (c) {
-        case NSCAPI::returnInvalidBufferLen:
-          LOG_ERROR(_T("UNKNOWN: Return buffer to small to handle this command."));
-          return c;
-        case NSCAPI::returnIgnored:
-          break;
-        case NSCAPI::returnOK:
-        case NSCAPI::returnWARN:
-        case NSCAPI::returnCRIT:
-        case NSCAPI::returnUNKNOWN:
-          LOG_DEBUG_STD(_T("Injected Result: ") + NSCHelper::translateReturn(c) + _T(" '") + (std::wstring)(returnMessageBuffer) + _T("'"));
-          LOG_DEBUG_STD(_T("Injected Performance Result: '") +(std::wstring)(returnPerfBuffer) + _T("'"));
-          return c;
-        default:
-          LOG_ERROR_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_);
-      return NSCAPI::returnCRIT;
-    } catch(...) {
-      LOG_ERROR_STD(_T("Unknown exception raised in module"));
-      return NSCAPI::returnCRIT;
-    }
-  }
-  LOG_MESSAGE_STD(_T("No handler for command: '") + command + _T("'"));
-  return NSCAPI::returnIgnored;
+      std::wstring msg, perf;
+      int returnCode = shared_client_->inject(command, arrayBuffer::arrayBuffer2string(argument, argLen, _T(" ")), L' ', true, msg, perf);
+      NSCHelper::wrapReturnString(returnMessageBuffer, returnMessageBufferLen, msg, returnCode);
+      return NSCHelper::wrapReturnString(returnPerfBuffer, returnPerfBufferLen, perf, returnCode);
+    } catch (nsclient_session::session_exception &e) {
+      LOG_ERROR_STD(_T("Failed to inject remote command: ") + e.what());
+      int returnCode = NSCHelper::wrapReturnString(returnMessageBuffer, returnMessageBufferLen, _T("Failed to inject remote command: ") + e.what(), NSCAPI::returnCRIT);
+      return NSCHelper::wrapReturnString(returnPerfBuffer, returnPerfBufferLen, _T(""), returnCode);
+    } catch (...) {
+      LOG_ERROR_STD(_T("Failed to inject remote command: Unknown exception"));
+      int returnCode = NSCHelper::wrapReturnString(returnMessageBuffer, returnMessageBufferLen, _T("Failed to inject remote command:  + e.what()"), NSCAPI::returnCRIT);
+      return NSCHelper::wrapReturnString(returnPerfBuffer, returnPerfBufferLen, _T(""), returnCode);
+    }
+  } else {
+    ReadLock readLock(&m_mutexRW, true, 5000);
+    if (!readLock.IsLocked()) {
+      LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex."));
+      return NSCAPI::returnUNKNOWN;
+    }
+    for (pluginList::size_type i = 0; i < commandHandlers_.size(); i++) {
+      try {
+        NSCAPI::nagiosReturn c = commandHandlers_[i]->handleCommand(command, argLen, argument, returnMessageBuffer, returnMessageBufferLen, returnPerfBuffer, returnPerfBufferLen);
+        switch (c) {
+          case NSCAPI::returnInvalidBufferLen:
+            LOG_ERROR(_T("UNKNOWN: Return buffer to small to handle this command."));
+            return c;
+          case NSCAPI::returnIgnored:
+            break;
+          case NSCAPI::returnOK:
+          case NSCAPI::returnWARN:
+          case NSCAPI::returnCRIT:
+          case NSCAPI::returnUNKNOWN:
+            LOG_DEBUG_STD(_T("Injected Result: ") + NSCHelper::translateReturn(c) + _T(" '") + (std::wstring)(returnMessageBuffer) + _T("'"));
+            LOG_DEBUG_STD(_T("Injected Performance Result: '") +(std::wstring)(returnPerfBuffer) + _T("'"));
+            return c;
+          default:
+            LOG_ERROR_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_);
+        return NSCAPI::returnCRIT;
+      } catch(...) {
+        LOG_ERROR_STD(_T("Unknown exception raised in module"));
+        return NSCAPI::returnCRIT;
+      }
+    }
+    LOG_MESSAGE_STD(_T("No handler for command: '") + command + _T("'"));
+    return NSCAPI::returnIgnored;
+  }
 }
 
@@ -606 +950 @@
   if ((msgType == NSCAPI::debug)&&(!logDebug())) {
     return;
+  }
+  if (shared_server_.get() != NULL && shared_server_->hasClients()) {
+    try {
+      shared_server_->sendLogMessageToClients(msgType, file, line, message);
+    } catch (nsclient_session::session_exception e) {
+      std::wcout << _T("Failed to send message to clients: ") << e.what() << std::endl;
+    }
   }
   std::wstring file_stl = file;
@@ -644 +995 @@
       std::cout << k << " " << strEx::wstring_to_string(file_stl) << "(" << line << ") " << strEx::wstring_to_string(message) << std::endl;
     }
-    for (pluginList::size_type i = 0; i< messageHandlers_.size(); i++) {
-      try {
-        messageHandlers_[i]->handleMessage(msgType, file, line, message.c_str());
-      } catch(const NSPluginException& e) {
-        // Here we are pretty much fucked! (as logging this might cause a loop :)
-        std::wcout << _T("Caught: ") << e.error_ << _T(" when trying to log a message...") << std::endl;
-        std::wcout << _T("This is *really really* bad, now the world is about to end...") << std::endl;
+    if (messageHandlers_.size() == 0 || !plugins_loaded_) {
+      log_cache_.push_back(cached_log_entry(msgType, file, line, message));
+    } else {
+      if (log_cache_.size() > 0) {
+        std::wcout << _T("*** SENDING CACHE***") << std::endl;
+        for (log_cache_type::const_iterator cit=log_cache_.begin();cit!=log_cache_.end();++cit) {
+          for (pluginList::size_type i = 0; i< messageHandlers_.size(); i++) {
+            try {
+              messageHandlers_[i]->handleMessage((*cit).msgType, (_T("CACHE") + (*cit).file).c_str(), (*cit).line, (*cit).message.c_str());
+            } catch(const NSPluginException& e) {
+              // Here we are pretty much fucked! (as logging this might cause a loop :)
+              std::wcout << _T("Caught: ") << e.error_ << _T(" when trying to log a message...") << std::endl;
+              std::wcout << _T("This is *really really* bad, now the world is about to end...") << std::endl;
+            }
+          }
+        }
+        log_cache_.clear();
+      }
+      for (pluginList::size_type i = 0; i< messageHandlers_.size(); i++) {
+        try {
+          messageHandlers_[i]->handleMessage(msgType, file, line, message.c_str());
+        } catch(const NSPluginException& e) {
+          // Here we are pretty much fucked! (as logging this might cause a loop :)
+          std::wcout << _T("Caught: ") << e.error_ << _T(" when trying to log a message...") << std::endl;
+          std::wcout << _T("This is *really really* bad, now the world is about to end...") << std::endl;
+        }
       }
     }
@@ -673 +1043 @@
     Settings::getInstance()->setFile(basePath, _T("NSC.ini"));
   } catch (SettingsException e) {
-    NSC_LOG_ERROR_STD(_T("Failed to set settings file") + e.getMessage());
+    LOG_ERROR_STD(_T("Failed to set settings file") + e.getMessage());
   }
   return basePath;
@@ -683 +1053 @@
     return NSCHelper::wrapReturnString(buffer, bufLen, Settings::getInstance()->getString(section, key, defaultValue), NSCAPI::isSuccess);
   } catch (...) {
-    NSC_LOG_ERROR_STD(_T("Failed to getString: ") + key);
+    LOG_ERROR_STD(_T("Failed to getString: ") + key);
     return NSCAPI::hasFailed;
   }
@@ -691 +1061 @@
     return Settings::getInstance()->getInt(section, key, defaultValue);
   } catch (SettingsException e) {
-    NSC_LOG_ERROR_STD(_T("Failed to set settings file") + e.getMessage());
+    LOG_ERROR_STD(_T("Failed to set settings file") + e.getMessage());
     return defaultValue;
   }
@@ -720 +1090 @@
     return NSCAPI::isSuccess;
   } catch (...) {
-    NSC_LOG_ERROR_STD(_T("Failed to getSection: ") + section);
+    LOG_ERROR_STD(_T("Failed to getSection: ") + section);
     return NSCAPI::hasFailed;
   }
@@ -848 +1218 @@
     Settings::getInstance()->setString(section, key, value);
   } catch (...) {
-    NSC_LOG_ERROR_STD(_T("Failed to setString: ") + key);
+    LOG_ERROR_STD(_T("Failed to setString: ") + key);
     return NSCAPI::hasFailed;
   }
@@ -857 +1227 @@
     Settings::getInstance()->setInt(section, key, value);
   } catch (...) {
-    NSC_LOG_ERROR_STD(_T("Failed to setInt: ") + key);
+    LOG_ERROR_STD(_T("Failed to setInt: ") + key);
     return NSCAPI::hasFailed;
   }
@@ -874 +1244 @@
     return NSCAPI::hasFailed;
   } catch (...) {
-    NSC_LOG_ERROR_STD(_T("Failed to write settings"));
+    LOG_ERROR_STD(_T("Failed to write settings"));
     return NSCAPI::hasFailed;
   }
@@ -891 +1261 @@
     return NSCAPI::hasFailed;
   } catch (...) {
-    NSC_LOG_ERROR_STD(_T("Failed to read settings"));
+    LOG_ERROR_STD(_T("Failed to read settings"));
     return NSCAPI::hasFailed;
   }

NSClient++.h

@@ -30 +30 @@
 #include <map>
 #include <com_helpers.hpp>
-
+#include <nsclient_session.hpp>
 
 /**
@@ -57 +57 @@
  *
  */
-class NSClientT {
+class NSClientT : public nsclient_session::session_handler_interface {
+
 private:
+
+  class NSException {
+    std::wstring what_;
+  public:
+    NSException(std::wstring what) : what_(what){}
+    std::wstring what() {
+      return what_;
+    }
+  };
+  struct cached_log_entry {
+    cached_log_entry(int msgType_, std::wstring file_, int line_, std::wstring message_) 
+      : msgType(msgType_),
+      file(file_),
+      line(line_),
+      message(message_)
+    {}
+    int msgType;
+    std::wstring file;
+    int line;
+    std::wstring message;
+  };
+
   typedef NSCPlugin* plugin_type;
   typedef std::vector<plugin_type> pluginList;
   typedef std::map<std::wstring,std::wstring> cmdMap;
+  typedef std::list<cached_log_entry> log_cache_type;
   pluginList plugins_;
   pluginList commandHandlers_;
@@ -73 +97 @@
   typedef enum log_status {log_unknown, log_debug, log_nodebug };
   log_status debug_;
-  bool boot_;
   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_;
+  bool enable_shared_session_;
 
 public:
   // c-tor, d-tor
-  NSClientT(void) : debug_(log_unknown), boot_(true) {}
+  NSClientT(void) : debug_(log_unknown), plugins_loaded_(false), enable_shared_session_(false) {}
   virtual ~NSClientT(void) {}
   void enableDebug(bool debug = true) {
@@ -86 +114 @@
       debug_ = log_nodebug;
   }
-  void setBoot(bool boot = true) {
-    boot_ = boot;
-  }
 
   // Service helper functions
   bool InitiateService();
   void TerminateService(void);
+  bool initCore(bool boot);
+  bool exitCore(bool boot);
   static void WINAPI service_main_dispatch(DWORD dwArgc, LPTSTR *lpszArgv);
   static void WINAPI service_ctrl_dispatch(DWORD dwCtrlCode);
+  static DWORD WINAPI service_ctrl_dispatch_ex(DWORD dwControl, DWORD dwEventType, LPVOID lpEventData, LPVOID lpContext);
+  void service_on_session_changed(DWORD dwSessionId, bool logon, DWORD dwEventType);
 
   // Member functions
@@ -108 +137 @@
   plugin_type loadPlugin(const std::wstring plugin);
   void loadPlugins(void);
-  void unloadPlugins(void);
+  void unloadPlugins(bool unloadLoggers);
   std::wstring describeCommand(std::wstring command);
   std::list<std::wstring> getAllCommandNames();
   void registerCommand(std::wstring cmd, std::wstring desc);
   unsigned int getBufferLength();
+  void startTrayIcons();
+  void startTrayIcon(DWORD dwSessionId);
 
   bool logDebug();
+
+  // Shared session interface:
+  void session_error(std::wstring file, unsigned int line, std::wstring msg);
+  void session_log_message(int msgType, const TCHAR* file, const int line, std::wstring message) {
+    reportMessage(msgType, file, line, message);
+  }
+  int session_inject(std::wstring command, std::wstring arguments, std::wstring splitter, bool escape, std::wstring &msg, std::wstring & perf) {
+    return inject(command, arguments, splitter[0], escape, msg, perf);
+  }
+
+
 
 private:

changelog

@@ -5 +5 @@
  * Improved socket performance (would be nice if we could be used as a "hub")
 
+2008-08-16 MickeM
+ * *WARNING* THIS IS VERY VERY UNSTABEL (possibly)
+ * *WARNING* A lot of new untested code here so dont run in production enviornments :)
+ + Added shared session so system tray can communicate with master
+ + Added new system tray handlig (via TS so FUS should work with it)
+ + Added new option [System] / shared_session=0 (or 1) to enable / disable the new shared memory framework (it is for now disabled by default)
+   If you want to try this remember to change that option but also beware! it is dagerous and not finnished and and also there is as of now no security at all.
+
 2008-08-09 MickeM
- + Added ChangeWindowMessageFilter so systray should not work on vista and beyond!
+ + Added ChangeWindowMessageFilter so systray should maybe work on vista and beyond!
 
 2008-07-28 MickeM

helpers/UploadBinaries/UploadBinaries.vcproj

@@ -381 +381 @@
       <Tool
         Name="VCCustomBuildTool"
-        CommandLine="echo Making archive&#x0D;&#x0A;7z.exe a -r -tzip -bd &quot;$(TargetDir)\NSClient++-$(PlatformName).zip&quot; &quot;$(TargetDir)\*&quot;&#x0D;&#x0A;echo Renaming archive&#x0D;&#x0A;postbuild.pl &quot;$(TargetDir)\NSClient++-$(PlatformName).zip&quot; zip&#x0D;&#x0A;echo Sending to server&#x0D;&#x0A;pscp.exe &quot;$(TargetDir)\*.zip&quot; mickem@ssl.nakednuns.org:/var/www/files/nightly/&#x0D;&#x0A;"
+        CommandLine="echo Making archive&#x0D;&#x0A;7z.exe a -r -tzip -bd &quot;$(TargetDir)\NSClient++-$(PlatformName).zip&quot; &quot;$(TargetDir)\*&quot;&#x0D;&#x0A;echo Renaming archive&#x0D;&#x0A;postbuild.pl &quot;$(TargetDir)\NSClient++-$(PlatformName).zip&quot; zip&#x0D;&#x0A;echo Sending to server&#x0D;&#x0A;pscp.exe &quot;$(TargetDir)\*.zip&quot; nscp@druss.medin.name:/var/www/files/nightly/&#x0D;&#x0A;"
         Outputs="foo"
       />

helpers/UploadInstaller/UploadInstaller.vcproj

@@ -247 +247 @@
       <Tool
         Name="VCCustomBuildTool"
-        CommandLine="echo Renaming archive&#x0D;&#x0A;echo mkdir &quot;$(OutDir)&quot;&#x0D;&#x0A;mkdir &quot;$(OutDir)&quot;&#x0D;&#x0A;cmd /c del &quot;$(OutDir)\*.msi&quot;&quot;&#x0D;&#x0A;cmd /c copy &quot;..\installer\bin\$(ConfigurationName)\NSClient++.msi&quot; &quot;$(OutDir)\NSClient++-$(PlatformName).msi&quot;&quot;&#x0D;&#x0A;postbuild.pl &quot;$(TargetDir)\NSClient++-$(PlatformName).msi&quot; msi&#x0D;&#x0A;echo Sending to server&#x0D;&#x0A;pscp.exe &quot;$(TargetDir)\*.msi&quot; mickem@ssl.nakednuns.org:/var/www/files/nightly/&#x0D;&#x0A;"
+        CommandLine="echo Renaming archive&#x0D;&#x0A;echo mkdir &quot;$(OutDir)&quot;&#x0D;&#x0A;mkdir &quot;$(OutDir)&quot;&#x0D;&#x0A;cmd /c del &quot;$(OutDir)\*.msi&quot;&quot;&#x0D;&#x0A;cmd /c copy &quot;..\installer\bin\$(ConfigurationName)\NSClient++.msi&quot; &quot;$(OutDir)\NSClient++-$(PlatformName).msi&quot;&quot;&#x0D;&#x0A;postbuild.pl &quot;$(TargetDir)\NSClient++-$(PlatformName).msi&quot; msi&#x0D;&#x0A;echo Sending to server&#x0D;&#x0A;pscp.exe &quot;$(TargetDir)\*.msi&quot; nscp@druss.medin.name:/var/www/files/nightly/&#x0D;&#x0A;"
         Outputs="foo"
       />

include/Mutex.h

@@ -25 +25 @@
 #include <windows.h>
 #include <iostream>
+#include <error.hpp>
+
+class mutex_exception {
+  std::wstring what_;
+public:
+  mutex_exception(std::wstring what) : what_(what) {}
+  std::wstring what() { return what_; }
+};
 
 /**
@@ -50 +58 @@
  */
 class MutexHandler {
+public:
 private:
   HANDLE hMutex;
+  DWORD dwWaitResult;
+  bool bCreated;
 public:
   /**
@@ -57 +68 @@
    * Creates an unnamed mutex.
    */
-  MutexHandler() : hMutex(NULL) {
-    hMutex = CreateMutex(NULL, FALSE, NULL);
+  MutexHandler(std::wstring name = _T("")) : hMutex(NULL), dwWaitResult(0), bCreated(false) {
+    //std::wcout << _T("Creating mutex: ") << name << std::endl;
+    hMutex = CreateMutex(NULL, FALSE, name.empty()?NULL:name.c_str());
     if (hMutex == NULL && GetLastError() == ERROR_ALREADY_EXISTS )
-      hMutex = OpenMutex(MUTEX_ALL_ACCESS, FALSE, NULL);
-    if (hMutex == NULL) {
-      std::wcout << _T("Error in mutex creation: ") << GetLastError() << std::endl;
-    }
+      hMutex = OpenMutex(MUTEX_ALL_ACCESS, FALSE, name.empty()?NULL:name.c_str());
+    else 
+      bCreated = true;
+    if (hMutex == NULL)
+      throw mutex_exception(_T("Failed to create mutex: ") + error::lookup::last_error());
   }
   /**
@@ -74 +87 @@
     hMutex = NULL;
   }
+  void close() {
+    if (hMutex)
+      CloseHandle(hMutex);
+    hMutex = NULL;
+  }
+  bool mutexWasCreated() {
+    return bCreated;
+  }
   /**
    * HANDLe cast operator to retrieve the handle from the enclosed mutex object.
@@ -80 +101 @@
   operator HANDLE () const {
     return hMutex;
+  }
+  /**
+  * Release the mutex
+  */
+  void releaseLock() {
+    if (hMutex == NULL)
+      throw mutex_exception(_T("Failed to release mutex lock (mutex handle is null)"));
+    if (!ReleaseMutex(hMutex))
+      throw mutex_exception(_T("Failed to relase the mutex: ") + error::lookup::last_error());
+  }
+  /**
+  * Waits for the mutex object.
+  * @timeout The timeout before abandoning wait
+  */
+  bool accuireLock(DWORD timeout = 5000L) {
+    if (hMutex == NULL)
+      throw mutex_exception(_T("Failed to get mutex lock (mutex handle is null)"));
+    dwWaitResult = WaitForSingleObject(hMutex, timeout);
+    switch (dwWaitResult) {
+      // The thread got mutex ownership.
+    case WAIT_OBJECT_0:
+      return true;
+    case WAIT_TIMEOUT: 
+      return false;
+    case WAIT_ABANDONED: 
+      return true;
+    default:
+      throw mutex_exception(_T("Unknown returncode from the mutex: ") + strEx::itos(dwWaitResult));
+      
+    }
+  }
+  /**
+  * Get the result of the wait operation.
+  * @return Result of the wait operation
+  */
+  DWORD getWaitResult() const {
+    return dwWaitResult;
   }
 };
@@ -125 +183 @@
   MutexLock(HANDLE hMutex, DWORD timeout = 5000L) : bHasMutex(false), hMutex_(hMutex) {
     if (hMutex_ == NULL) {
-      std::wcout << _T("Error in mutex lock: ") << std::endl;
+      throw mutex_exception(_T("Failed to get mutex lock (mutex handle is null)"));
+      /*
       bHasMutex = false;
       return;
+      */
     }
     dwWaitResult = WaitForSingleObject(hMutex_, timeout);
@@ -135 +195 @@
       bHasMutex = true;
       break;
-        case WAIT_TIMEOUT: 
-      bHasMutex = false;
-      break;
-        case WAIT_ABANDONED: 
+        case WAIT_TIMEOUT:
+      bHasMutex = false;
+      break;
+        case WAIT_ABANDONED:
       bHasMutex = false;
       break;
@@ -195 +255 @@
   void lock(DWORD timeout = 5000L) {
     if (hMutex_ == NULL) {
+      throw mutex_exception(_T("Failed to get mutex lock (mutex handle is null)"));
+      /*
       std::wcout << _T("Error in mutex lock: ") << std::endl;
       bHasMutex = false;
       return;
+      */
     }
     dwWaitResult = WaitForSingleObject(hMutex_, timeout);

include/NSCHelper.cpp

@@ -146 +146 @@
   lpNSAPIMessage fNSAPIMessage = NULL;
   lpNSAPIStopServer fNSAPIStopServer = NULL;
+  lpNSAPIExit fNSAPIExit = NULL;
   lpNSAPIInject fNSAPIInject = NULL;
   lpNSAPICheckLogMessages fNSAPICheckLogMessages = NULL;
@@ -310 +311 @@
 }
 /**
+ * Close the program (usefull for tray/testmode) without stopping the service (unless this is the service).
+ * @author mickem
+ */
+void NSCModuleHelper::Exit(void) {
+  if (fNSAPIExit)
+    fNSAPIExit();
+}
+/**
  * Retrieve a string from the settings subsystem (INI-file)
  * Might possibly be located in the registry in the future.
@@ -609 +618 @@
   NSCModuleHelper::fNSAPIMessage = (NSCModuleHelper::lpNSAPIMessage)f(_T("NSAPIMessage"));
   NSCModuleHelper::fNSAPIStopServer = (NSCModuleHelper::lpNSAPIStopServer)f(_T("NSAPIStopServer"));
+  NSCModuleHelper::fNSAPIExit = (NSCModuleHelper::lpNSAPIExit)f(_T("NSAPIExit"));
   NSCModuleHelper::fNSAPIInject = (NSCModuleHelper::lpNSAPIInject)f(_T("NSAPIInject"));
   NSCModuleHelper::fNSAPIGetBasePath = (NSCModuleHelper::lpNSAPIGetBasePath)f(_T("NSAPIGetBasePath"));

include/NSCHelper.h

@@ -110 +110 @@
   typedef void (*lpNSAPIMessage)(int, const TCHAR*, const int, const TCHAR*);
   typedef NSCAPI::errorReturn (*lpNSAPIStopServer)(void);
+  typedef NSCAPI::errorReturn (*lpNSAPIExit)(void);
   typedef NSCAPI::nagiosReturn (*lpNSAPIInject)(const TCHAR*, const unsigned int, TCHAR **, TCHAR *, unsigned int, TCHAR *, unsigned int);
   typedef void* (*lpNSAPILoader)(TCHAR*);
@@ -137 +138 @@
   NSCAPI::nagiosReturn InjectSplitAndCommand(const std::wstring command, const std::wstring buffer, TCHAR splitChar, std::wstring & message, std::wstring & perf, bool escape = false);
   void StopService(void);
+  void Exit(void);
   std::wstring getBasePath();
   bool logDebug();
@@ -333 +335 @@
     } catch (...) { \
       NSC_LOG_CRITICAL(_T("Unknown exception in: commandLineExec(...)")); \
+      std::wcerr << _T("Unknown exception in: commandLineExec(...)") << std::endl; \
       return NSCAPI::hasFailed; \
     } \

include/NTService.h

@@ -22 +22 @@
 
 #include <string>
+#include <sysinfo.h>
 
 
@@ -80 +81 @@
   void service_main(DWORD dwArgc, LPTSTR *lpszArgv)
   {
-    // register our service control handler:
-    sshStatusHandle = RegisterServiceCtrlHandler( SZSERVICENAME, TBase::service_ctrl_dispatch);
+    if (systemInfo::isAboveW2K(systemInfo::getOSVersion())) {
+      ssStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SESSIONCHANGE;
+      sshStatusHandle = RegisterServiceCtrlHandlerEx( SZSERVICENAME, TBase::service_ctrl_dispatch_ex, NULL);
+    } else {
+      // register our service control handler:
+      sshStatusHandle = RegisterServiceCtrlHandler( SZSERVICENAME, TBase::service_ctrl_dispatch);
+    }
 
     // SERVICE_STATUS members that don't change in example
@@ -100 +106 @@
   }
 
-
-  void service_ctrl(DWORD dwCtrlCode) {
+  typedef struct tagWTSSESSION_NOTIFICATION
+  {
+    DWORD cbSize;
+    DWORD dwSessionId;
+
+  } WTSSESSION_NOTIFICATION, *PWTSSESSION_NOTIFICATION;
+#define WTS_SESSION_LOGON                  0x5
+#define WTS_SESSION_LOGOFF                 0x6
+
+  DWORD service_ctrl_ex(DWORD dwCtrlCode, DWORD dwEventType, LPVOID lpEventData, LPVOID lpContext) {
     switch(dwCtrlCode) 
     {
@@ -107 +121 @@
       ReportStatusToSCMgr(SERVICE_STOP_PENDING, NO_ERROR, 0);
       ServiceStop();
-      return;
+      return 0;
 
     case SERVICE_CONTROL_INTERROGATE:
       break;
 
+    case SERVICE_CONTROL_SESSIONCHANGE:
+      if (lpEventData != NULL && dwEventType == WTS_SESSION_LOGON)
+        service_on_session_changed(reinterpret_cast<WTSSESSION_NOTIFICATION*>(lpEventData)->dwSessionId, true, dwEventType);
+      else if (lpEventData != NULL && dwEventType == WTS_SESSION_LOGOFF)
+        service_on_session_changed(reinterpret_cast<WTSSESSION_NOTIFICATION*>(lpEventData)->dwSessionId, false, dwEventType);
+      else {
+        service_on_session_changed(reinterpret_cast<WTSSESSION_NOTIFICATION*>(lpEventData)->dwSessionId, false, dwEventType);
+      }
+      break;
+
     default:
       break;
@@ -117 +141 @@
     }
     ReportStatusToSCMgr(ssStatus.dwCurrentState, NO_ERROR, 0);
+    return 0;
   }
 
@@ -141 +166 @@
       ssStatus.dwControlsAccepted = 0;
     else
-      ssStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP;
+      ssStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP| SERVICE_ACCEPT_SESSIONCHANGE;
 
     ssStatus.dwCurrentState = dwCurrentState;

include/ServiceCmd.cpp

@@ -95 +95 @@
     CloseServiceHandle(schSCManager);
     if (result != TRUE)
-      throw SCException(_T("Could not query service information"));
+      throw SCException(_T("Could not change service information"));
   }
 

include/config.h

@@ -80 +80 @@
 #define NSCLIENT_SETTINGS_READ_TIMEOUT _T("socket_timeout")
 #define NSCLIENT_SETTINGS_READ_TIMEOUT_DEFAULT 30
+#define NSCLIENT_SETTINGS_SYSTRAY_EXE _T("systray_exe")
+#define NSCLIENT_SETTINGS_SYSTRAY_EXE_DEFAULT _T("systray.exe")
 
 // NRPE Settings headlines
@@ -198 +200 @@
 #define LOG_DATEMASK _T("date_mask")
 #define LOG_DATEMASK_DEFAULT _T("%Y-%m-%d %H:%M:%S")
+#define LOG_ROOT _T("root_folder")
+#define LOG_ROOT_DEFAULT _T("exe")
 
 // Main Settings
@@ -216 +220 @@
 #define MAIN_STRING_LENGTH _T("string_length")
 #define MAIN_STRING_LENGTH_DEFAULT 4096
-
-
-// LOA Config itemns
+#define MAIN_SHARED_SESSION _T("shared_session")
+#define MAIN_SHARED_SESSION_DEFAULT 0
+
+
+// LOA Config items
 #define LUA_SCRIPT_SECTION_TITLE _T("LUA Scripts")
 

include/strEx.h

@@ -37 +37 @@
   class string_exception : public std::exception {
     std::wstring _what;
+  public:
     string_exception(std::wstring what) : _what(what) {}
     std::wstring what() {
@@ -68 +69 @@
   inline std::string wstring_to_string( const wchar_t* pStr, int len) {
     if (pStr == NULL)
-      throw string_exception("Invalid pointer in wstring_to_string");
+      throw string_exception(_T("Invalid pointer in wstring_to_string"));
     if (len < 0 && len != -1) 
-      throw string_exception("Invalid string length in wstring_to_string");
+      throw string_exception(_T("Invalid string length in wstring_to_string"));
 
     // figure out how many narrow characters we are going to get 
@@ -94 +95 @@
   inline std::wstring string_to_wstring( const char* pStr , int len ) {
     if (pStr == NULL)
-      throw string_exception("Invalid pointer in wstring_to_string");
+      throw string_exception(_T("Invalid pointer in wstring_to_string"));
     if (len < 0 && len != -1) 
-      throw string_exception("Invalid string length in wstring_to_string");
+      throw string_exception(_T("Invalid string length in wstring_to_string"));
 
     // figure out how many wide characters we are going to get 
@@ -212 +213 @@
     }
   }
+  inline std::wstring ctos(TCHAR c) {
+    return std::wstring(c,1);
+  }
   inline std::wstring itos(unsigned int i) {
     std::wstringstream ss;

modules/CheckDisk/CheckDisk-2005.vcproj

@@ -188 +188 @@
       Name="Release|Win32"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -267 +267 @@
       Name="Release|x64"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

modules/CheckEventLog/CheckEventLog-2005.vcproj

@@ -25 +25 @@
       Name="Release|Win32"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -105 +105 @@
       Name="Release|x64"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

modules/CheckExternalScripts/CheckExternalScripts-2005.vcproj

@@ -193 +193 @@
       Name="Release|Win32"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -274 +274 @@
       Name="Release|x64"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

modules/CheckHelpers/CheckHelpers-2005.vcproj

@@ -188 +188 @@
       Name="Release|Win32"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -267 +267 @@
       Name="Release|x64"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

modules/CheckSystem/CheckSystem-2005.vcproj

@@ -190 +190 @@
       Name="Release|Win32"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -270 +270 @@
       Name="Release|x64"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

modules/CheckTaskSched/CheckTaskSched-2005.vcproj

@@ -153 +153 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="Wbemuuid.lib"
+        AdditionalDependencies="Mstask.lib"
         OutputFile="../../Debug/modules/$(ProjectName).dll"
         LinkIncremental="2"
@@ -192 +192 @@
       Name="Release|Win32"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -273 +273 @@
       Name="Release|x64"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -315 +315 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="Wbemuuid.lib"
+        AdditionalDependencies="Mstask.lib"
         OutputFile="../../Release/modules/$(ProjectName).dll"
         LinkIncremental="1"
@@ -478 +478 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="Wbemuuid.lib"
+        AdditionalDependencies="Mstask.lib"
         OutputFile="../../Dist/modules/$(ProjectName).dll"
         LinkIncremental="1"
@@ -801 +801 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="Wbemuuid.lib"
+        AdditionalDependencies="Mstask.lib"
         OutputFile="../../Debug/modules/$(ProjectName).dll"
         LinkIncremental="2"

modules/CheckWMI/CheckWMI-2005.vcproj

@@ -192 +192 @@
       Name="Release|Win32"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -273 +273 @@
       Name="Release|x64"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

modules/FileLogger/FileLogger-2005.vcproj

@@ -25 +25 @@
       Name="Release|Win32"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -104 +104 @@
       Name="Release|x64"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

modules/LUAScript/LUAScript-2005.vcproj

@@ -192 +192 @@
       Name="Release|Win32"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -273 +273 @@
       Name="Release|x64"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

modules/NRPEClient/NRPEClient-2005.vcproj

@@ -193 +193 @@
       Name="Release|Win32"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -274 +274 @@
       Name="Release|x64"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

modules/NRPEListener/NRPEListener-2005.vcproj

@@ -193 +193 @@
       Name="Release|Win32"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -274 +274 @@
       Name="Release|x64"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

modules/NSCAAgent/NSCAAgent-2005.vcproj

@@ -191 +191 @@
     <Configuration
       Name="Release|Win32"
-      OutputDirectory="$(ConfigurationName)"
-      IntermediateDirectory="$(ConfigurationName)"
+      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -272 +272 @@
     <Configuration
       Name="Release|x64"
-      OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

modules/NSClientListener/NSClientListener-2005.vcproj

@@ -190 +190 @@
       Name="Release|Win32"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -270 +270 @@
       Name="Release|x64"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

modules/RemoteConfiguration/RemoteConfiguration-2005.vcproj

@@ -188 +188 @@
       Name="Release|Win32"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -267 +267 @@
       Name="Release|x64"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

modules/SysTray/SysTray-2005.vcproj

@@ -25 +25 @@
       Name="Release|Win32"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
@@ -104 +104 @@
       Name="Release|x64"
       OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\modules"
-      IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+      IntermediateDirectory="tmp\$(PlatformName)\$(ConfigurationName)"
       ConfigurationType="2"
       InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"

modules/SysTray/SysTray.cpp

@@ -24 +24 @@
 #include <ServiceCmd.h>
 #include <config.h>
+#include <Winwlx.h>
+#include <sysinfo.h>
 
 SysTray gSysTray;
@@ -35 +37 @@
 SysTray::SysTray() : icon(_T("SysTray")) {}
 SysTray::~SysTray() {}
+
+
+void SysTray::show() {
+  icon.createThread();
+}
 bool SysTray::loadModule() {
-  try {
-    if ((serviceControll::GetServiceType(SZSERVICENAME)&SERVICE_INTERACTIVE_PROCESS)!=SERVICE_INTERACTIVE_PROCESS) {
+  if (systemInfo::isBelowXP(systemInfo::getOSVersion())) {
+    try {
+      if ((serviceControll::GetServiceType(SZSERVICENAME)&SERVICE_INTERACTIVE_PROCESS)!=SERVICE_INTERACTIVE_PROCESS) {
+        NSC_LOG_ERROR(_T("SysTray is not installed (or it cannot interact with the desktop) SysTray won't be loaded. Run ") SZAPPNAME _T(" SysTray install to change this."));
+        return true;
+      }
+    } catch (serviceControll::SCException e) {
       NSC_LOG_ERROR(_T("SysTray is not installed (or it cannot interact with the desktop) SysTray won't be loaded. Run ") SZAPPNAME _T(" SysTray install to change this."));
       return true;
     }
-  } catch (serviceControll::SCException e) {
-    NSC_LOG_ERROR(_T("SysTray is not installed (or it cannot interact with the desktop) SysTray won't be loaded. Run ") SZAPPNAME _T(" SysTray install to change this."));
-    return true;
+    show();
+  } else {
+    NSC_LOG_ERROR(_T("SysTray module is not used on windows XP and above (so you can remove it)."));
   }
-  icon.createThread();
   return true;
 }
-bool SysTray::unloadModule() {
+void SysTray::hide() {
   if (!icon.exitThread(20000)) {
     std::wcout << _T("MAJOR ERROR: Could not unload thread...") << std::endl;
     NSC_LOG_ERROR(_T("Could not exit the thread, memory leak and potential corruption may be the result..."));
-    return false;
+  }
+}
+bool SysTray::unloadModule() {
+  if (systemInfo::isBelowXP(systemInfo::getOSVersion())) {
+    hide();
   }
   return true;
@@ -61 +76 @@
     try {
       serviceControll::ModifyServiceType(SZSERVICENAME, SERVICE_WIN32_OWN_PROCESS | SERVICE_INTERACTIVE_PROCESS);
-      NSC_LOG_MESSAGE_STD(_T(MODULE_NAME) _T(" is now able to run as the SERVICE_INTERACTIVE_PROCESS flag has been set."));
+      std::wcout << _T(MODULE_NAME) << _T(" is now able to run as the SERVICE_INTERACTIVE_PROCESS flag has been set.") << std::endl;
     } catch (const serviceControll::SCException& e) {
-      NSC_LOG_ERROR_STD(_T("Could not modify service: ") + e.error_);
+      std::wcerr << _T("Could not modify service: ") << e.error_ << std::endl;
+      return -1;
+    } catch (...) {
+      std::wcerr << _T("Could not modify service: Unknown error!") << std::endl;
       return -1;
     }
@@ -69 +87 @@
     try {
       serviceControll::ModifyServiceType(SZSERVICENAME, SERVICE_WIN32_OWN_PROCESS);
-      NSC_LOG_MESSAGE_STD(_T(MODULE_NAME) _T(" is now not able to run as the SERVICE_INTERACTIVE_PROCESS flag has been reset."));
+      std::wcout << _T(" is now not able to run as the SERVICE_INTERACTIVE_PROCESS flag has been reset.") << std::endl;
     } catch (const serviceControll::SCException& e) {
-      NSC_LOG_ERROR_STD(_T("Could not modify service: ") + e.error_);
+      std::wcerr << _T("Could not modify service: ") << e.error_ << std::endl;
+      return -1;
+    } catch (...) {
+      std::wcerr << _T("Could not modify service: Unknown error!") << std::endl;
       return -1;
     }
   } else {
-    NSC_LOG_ERROR_STD(_T("Undefined command, usage: install or uninstall"));
+    std::wcerr << _T("Undefined command, usage: install or uninstall") << std::endl;
     return -1;
   }
@@ -120 +141 @@
 }
 
-
-
-
+extern void ShowIcon() {
+  gSysTray.show();
+}
+extern void HideIcon() {
+  gSysTray.hide();
+}
 NSC_WRAPPERS_MAIN_DEF(gSysTray);
 NSC_WRAPPERS_HANDLE_MSG_DEF(gSysTray);

modules/SysTray/SysTray.def

@@ -13 +13 @@
   NSGetModuleDescription
   NSCommandLineExec
+  ShowIcon
+  HideIcon

modules/SysTray/SysTray.h

@@ -26 +26 @@
 NSC_WRAPPERS_MAIN();
 NSC_WRAPPERS_CLI();
+
 
 
@@ -56 +57 @@
   bool unloadModule();
   void setLogWindow(HWND hWnd);
+  void show();
+  void hide();
 
   std::wstring getModuleName() {

modules/SysTray/SysTray.rc

@@ -95 +95 @@
     POPUP "POPUP"
     BEGIN
-        MENUITEM "NSClient++",                  ID_POPUP_NSCLIENT, INACTIVE
+        MENUITEM "NSClient++",            ID_POPUP_NSCLIENT, INACTIVE
         MENUITEM SEPARATOR
-        MENUITEM "Inject Command",              ID_POPUP_INJECTCOMMAND
-        MENUITEM "Stop Service",                ID_POPUP_STOPSERVICE
+        MENUITEM "Run &Command",          ID_POPUP_INJECTCOMMAND
+        MENUITEM "Show &Log",             ID_POPUP_SHOWLOG
         MENUITEM SEPARATOR
-        MENUITEM "Show Log",                    ID_POPUP_SHOWLOG
+        MENUITEM "&Close",                ID_POPUP_STOPSERVICE
     END
 END
@@ -225 +225 @@
 /////////////////////////////////////////////////////////////////////////////
 #endif    // not APSTUDIO_INVOKED
-

modules/SysTray/TrayIcon.cpp

@@ -50 +50 @@
   if (fnChangeWindowMessageFilter == NULL)
     fnChangeWindowMessageFilter = (LPFN_CHANGEWINDOWMESSAGEFILTER)GetProcAddress(GetModuleHandle(TEXT("user32")),"ChangeWindowMessageFilter");
-  if (fnChangeWindowMessageFilter == NULL)
+  if (fnChangeWindowMessageFilter == NULL) {
+    NSC_DEBUG_MSG(_T("Failed to load: ChangeWindowMessageFilter aparently we are not on Vista..."));
     return true;
+  }
+  NSC_DEBUG_MSG(_T("Chaning window message filters..."));
   return fnChangeWindowMessageFilter(message,what);
 }
 
+void test() {
+/* error 
+WTSQueryUserToken(dwSessionId, &hToken);
+DuplicateTokenEx(hTokenNew,MAXIMUM_ALLOWED,NULL,SecurityIdentification,TokenPrimary,&hTokenDup);
+*/
+/*
+  HANDLE hToken = NULL, hTokenDup = NULL;
+  HMODULE  hmod = LoadLibrary("kernel32.dll");
+  WTSGETACTIVECONSOLESESSIONID lpfnWTSGetActiveConsoleSessionId = (WTSGETACTIVECONSOLESESSIONID)GetProcAddress(hmod,"WTSGetActiveConsoleSessionId"); 
+  DWORD dwSessionId = lpfnWTSGetActiveConsoleSessionId();
+  WTSQueryUserToken(dwSessionId, &hToken);
+  //DuplicateTokenEx(hTokenNew,MAXIMUM_ALLOWED,NULL,SecurityIdentification,TokenPrimary,&hTokenDup);
+  //
+  WriteToLog("Calling lpfnCreateEnvironmentBlock");
+  ZeroMemory( &si, sizeof( STARTUPINFO ) );
+  si.cb = sizeof( STARTUPINFO );
+  si.lpDesktop = "winsta0\\default";
+
+
+  LPVOID  pEnv = NULL;
+  DWORD dwCreationFlag = NORMAL_PRIORITY_CLASS | CREATE_NEW_CONSOLE;
+  HMODULE hModule = LoadLibrary("Userenv.dll");
+  if(hModule )
+  {
+    LPFN_CreateEnvironmentBlock lpfnCreateEnvironmentBlock = (LPFN_CreateEnvironmentBlock)GetProcAddress( hModule, "CreateEnvironmentBlock" );
+    if( lpfnCreateEnvironmentBlock != NULL )
+    {
+      if(lpfnCreateEnvironmentBlock(&pEnv, hTokenDup, FALSE))
+      {
+        WriteToLog("CreateEnvironmentBlock Ok");
+        dwCreationFlag |= CREATE_UNICODE_ENVIRONMENT;    
+      }
+      else
+      {
+        pEnv = NULL;
+      }
+    }
+  }
+  //
+  ZeroMemory( &pi,sizeof(pi));
+
+  if ( !CreateProcessAsUser(
+    hTokenDup,
+    NULL,
+    ( char * )pszCmd,  
+    NULL,
+    NULL,
+    FALSE,
+    dwCreationFlag,
+    pEnv,
+    NULL,
+    &si,
+    &pi
+    ) )
+  {
+
+    goto RESTORE;
+  } 
+*/
+
+}
 
 void IconWidget_::createDialog(void) {
-  ChangeWindowMessageFilter()
   hDlgWnd = ::CreateDialog(NSCModuleWrapper::getModule(),MAKEINTRESOURCE(IDD_NSTRAYDLG),NULL,TrayIcon::DialogProc);
 
@@ -64 +127 @@
     NSC_LOG_ERROR_STD(_T("Failed to register 'TaskbarCreated': ") + error::lookup::last_error());
   }
-  ChangeWindowMessageFilter(UDM_TASKBARCREATED, MSGFLT_ADD);
+  if (!ChangeWindowMessageFilter(UDM_TASKBARCREATED, MSGFLT_ADD)) {
+    NSC_LOG_ERROR_STD(_T("Failed to cchange window filter: ") + error::lookup::last_error());
+  }
 
   MSG Msg;
@@ -319 +384 @@
       switch (cmd) {
       case ID_POPUP_STOPSERVICE:
-        NSCModuleHelper::StopService();
+        NSCModuleHelper::Exit();
         break;
       case ID_POPUP_INJECTCOMMAND: