Changeset bc97cd8 in nscp

Timestamp:

09/06/08 20:51:13 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

dc59b0e

Parents:

c0522cd

Message:

2008-09-06 MickeM

• Improved error reporting in the eventlogchecker
• *BREAKING CHANGE* filter=new is now the default so unless you use the new filtering you need to specify filter=old instead! I Recommend everyone to stop using the "old" filtering.

2008-09-04 MickeM

• Fixed issues with new service stuff on NT4 and W2K (should work fine now) + Added some DebugOutput? to service handling features so if you experience tropubel try using sysinternals DebugView? too se logging before the agent startes.
• Fixed a memory leak in the error formating code

2008-08-24 MickeM

• Changed NSCA "general problem" error message to be more descriptive.
• Fixed issue with CheckCPU not returning a valid performance unit (%) see issue #219 for details.

Files:

• AutoBuild.h (modified) (1 diff)
• NSClient++-2005.sln (modified) (4 diffs)
• NSClient++.cpp (modified) (7 diffs)
• NSClient++.h (modified) (2 diffs)
• changelog (modified) (1 diff)
• helpers/installer/Product.wxs (modified) (2 diffs)
• helpers/systray_helper/TrayWidget.cpp (modified) (10 diffs)
• helpers/systray_helper/TrayWidget.h (modified) (4 diffs)
• helpers/systray_helper/systray_helper.cpp (modified) (1 diff)
• helpers/systray_helper/systray_helper.vcproj (modified) (1 diff)
• include/NSCHelper.cpp (modified) (1 diff)
• include/NTService.h (modified) (10 diffs)
• include/error.hpp (modified) (4 diffs)
• include/execute_process.hpp (modified) (1 diff)
• include/nsclient_session.hpp (modified) (3 diffs)
• include/strEx.h (modified) (1 diff)
• include/sysinfo.h (modified) (1 diff)
• modules/CheckDisk/CheckDisk.cpp (modified) (3 diffs)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (3 diffs)
• modules/CheckSystem/CheckSystem.cpp (modified) (1 diff)
• modules/FileLogger/FileLogger.cpp (modified) (4 diffs)
• modules/LUAScript/script_wrapper.hpp (modified) (1 diff)
• modules/NSCAAgent/NSCAAgent-2005.vcproj (modified) (1 diff)
• modules/NSCAAgent/NSCAThread.cpp (modified) (2 diffs)
• modules/SysTray/SysTray.cpp (modified) (1 diff)
• scripts/test.lua (modified) (2 diffs)

AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#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")
+#define FILEVER        0,3,3,39
+#define PRODUCTVER     0,3,3,39
+#define STRFILEVER     _T("0.3.3.39")
+#define STRPRODUCTVER  _T("0.3.3.39")
+#define STRPRODUCTDATE  _T("2008-09-05")
 #endif // AUTOBUILD_H

NSClient++-2005.sln

@@ -964 +964 @@
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Release|Mixed Platforms.Build.0 = Release
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Release|Win32.ActiveCfg = Release
-    {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Release|Win32.Build.0 = Release
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Release|x64.ActiveCfg = Release
     {A3CF4E23-1D1B-4D93-A16A-48C52D118560}.Release|x64.Build.0 = Release
@@ -1001 +1000 @@
     {6206F046-3D36-4258-BB03-3291A7070117}.Release|Mixed Platforms.Build.0 = Release|Win32
     {6206F046-3D36-4258-BB03-3291A7070117}.Release|Win32.ActiveCfg = Release|Win32
-    {6206F046-3D36-4258-BB03-3291A7070117}.Release|Win32.Build.0 = Release|Win32
     {6206F046-3D36-4258-BB03-3291A7070117}.Release|x64.ActiveCfg = Release|Win32
     {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Debug|Any CPU.ActiveCfg = Debug|x64
@@ -1038 +1036 @@
     {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Release|Mixed Platforms.Build.0 = Release|x64
     {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Release|Win32.ActiveCfg = Release|Win32
-    {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Release|Win32.Build.0 = Release|Win32
     {D96F7075-F6CD-4921-B5D8-8488E2D24BDB}.Release|x64.ActiveCfg = Release|x64
     {19BF0AD8-0013-46C7-9E91-F60FE3B0A63D}.Debug|Any CPU.ActiveCfg = Debug|Win32
@@ -1072 +1069 @@
     {19BF0AD8-0013-46C7-9E91-F60FE3B0A63D}.Release|Mixed Platforms.Build.0 = Release|Win32
     {19BF0AD8-0013-46C7-9E91-F60FE3B0A63D}.Release|Win32.ActiveCfg = Release|Win32
-    {19BF0AD8-0013-46C7-9E91-F60FE3B0A63D}.Release|Win32.Build.0 = Release|Win32
     {19BF0AD8-0013-46C7-9E91-F60FE3B0A63D}.Release|x64.ActiveCfg = Release|Win32
     {F3401E75-60FB-4A0E-A18C-6505587D5B1A}.Debug|Any CPU.ActiveCfg = Debug|x64

NSClient++.cpp

@@ -26 +26 @@
 #include <Lmcons.h>
 
-NSClient mainClient;  // Global core instance.
+NSClient mainClient(SZSERVICENAME); // Global core instance.
 bool g_bConsoleLog = false;
 
@@ -380 +380 @@
 
   if (enable_shared_session_) {
+    LOG_MESSAGE_STD(_T("Enabling shared session..."));
     if (boot) {
+      LOG_MESSAGE_STD(_T("Starting shared session..."));
       try {
         shared_server_.reset(new nsclient_session::shared_server_session(this));
@@ -397 +399 @@
       }
     } else {
+      LOG_MESSAGE_STD(_T("Attaching to shared session..."));
       try {
         std::wstring id = _T("_attached_") + strEx::itos(GetCurrentProcessId()) + _T("_");
@@ -594 +597 @@
  */
 void WINAPI NSClientT::service_main_dispatch(DWORD dwArgc, LPTSTR *lpszArgv) {
-  mainClient.service_main(dwArgc, lpszArgv);
+  try {
+    mainClient.service_main(dwArgc, lpszArgv);
+  } catch (service_helper::service_exception e) {
+    LOG_ERROR_STD(_T("Unknown service error: ") + e.what());
+  } catch (...) {
+    LOG_ERROR_STD(_T("Unknown service error!"));
+  }
 }
 DWORD WINAPI NSClientT::service_ctrl_dispatch_ex(DWORD dwControl, DWORD dwEventType, LPVOID lpEventData, LPVOID lpContext) {
@@ -965 +974 @@
     ReadLock readLock(&m_mutexRW, true, 5000);
     if (!readLock.IsLocked()) {
+      OutputDebugString(_T("Message was lost as the core was locked..."));
       std::wcout << _T("Message was lost as the core was locked...") << std::endl;
       return;
@@ -970 +980 @@
     MutexLock lock(messageMutex);
     if (!lock.hasMutex()) {
+      OutputDebugString(_T("Message was lost as the core was locked..."));
+      OutputDebugString(message.c_str());
       std::wcout << _T("Message was lost as the core was locked...") << std::endl;
       std::wcout << message << std::endl;
@@ -996 +1008 @@
     }
     if (messageHandlers_.size() == 0 || !plugins_loaded_) {
+      OutputDebugString(message.c_str());
       log_cache_.push_back(cached_log_entry(msgType, file, line, message));
     } else {

NSClient++.h

@@ -152 +152 @@
     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);
+  int session_inject(std::wstring command, std::wstring arguments, TCHAR splitter, bool escape, std::wstring &msg, std::wstring & perf) {
+    return inject(command, arguments, splitter, escape, msg, perf);
   }
 
@@ -163 +163 @@
 };
 
-typedef NTService<NSClientT> NSClient;
+typedef service_helper::NTService<NSClientT> NSClient;
 
 

changelog

@@ -4 +4 @@
  * Add API for rehashing the daemon (or implement it the API is there but does nothing)
  * Improved socket performance (would be nice if we could be used as a "hub")
+
+2008-09-06 MickeM
+ * Improved error reporting in the eventlogchecker
+ * *BREAKING CHANGE* filter=new is now the default so unless you use the new filtering you need to specify filter=old instead!
+   I Recomend everyone to stop using the "old" filtering.
+
+2008-09-04 MickeM
+ * Fixed issues with new service stuff on NT4 and W2K (should work fine now)
+ + Added some DebugOutput to service handling features so if you experience tropubel try using sysinternals DebugView too se logging before the agent startes.
+ * Fixed a memory leak in the error formating code
+
+2008-08-24 MickeM
+ * Changed NSCA "general problem" error message to be more descriptive.
+ * Fixed issue with CheckCPU not returning a valid performance unit (%) see issue #219 for details.
 
 2008-08-16 MickeM

helpers/installer/Product.wxs

@@ -35 +35 @@
   <?endif?>
 
-  <Product Id="$(var.Product.GUID)" Name="NSClient++ ($(var.PlatForm))" Language="1033" Version="0.3.1.0" Manufacturer="MySolutions NORDIC">
+  <Product Id="$(var.Product.GUID)" Name="NSClient++ ($(var.PlatForm))" Language="1033" Version="0.3.4.0" Manufacturer="MySolutions NORDIC">
     <Package Id="$(var.Package.GUID)" Description="A simple windows monitor agent for (amongst others) nagios."
              Comments="This will appear in the file summary stream." InstallerVersion="200" Compressed="yes"/>
@@ -60 +60 @@
                           LongName="Stop NSClient++ ($(var.PlatForm))" WorkingDirectory='INSTALLDIR' Icon="nsclient.exe"
                           IconIndex="0" Arguments="/stop" Description="Stop NSClient++ as a service"/>
+              </File>
+              <File Id="NSClientTRAY" Name="systray.exe" DiskId="1"
+                    Source="$(var.Source)/systray.exe" Vital="yes">
+                <Shortcut Id="StartmenuNSClientTray" Directory="ProgramMenuDir" Name="NSCPTray"
+                          LongName="NSClient++ ($(var.PlatForm) system tray)" WorkingDirectory="INSTALLDIR" Icon="nsclient.exe"
+                          IconIndex="0" Description="Run NSClient++ in test mode"/>
               </File>
               <File Id="NSClientINI" Name="NSC.ini" LongName="NSC.ini" DiskId="1" Source="$(var.Source)/NSC.ini" Vital="yes"/>

helpers/systray_helper/TrayWidget.cpp

@@ -73 +73 @@
 }
 HINSTANCE ghInstance = NULL;
-IconWidget *gTrayInstance = NULL;
-IconWidget::IconWidget(std::wstring cmdLine) {
+TrayWidget *gTrayInstance = NULL;
+TrayWidget::TrayWidget(std::wstring cmdLine) {
   strEx::splitList list = strEx::splitEx(cmdLine, _T(" "));
   channel_id_ = getArgumentValue(_T("-channel"), list);
@@ -90 +90 @@
   }
 }
-IconWidget::~IconWidget() {
+TrayWidget::~TrayWidget() {
   gTrayInstance = NULL;
   try {
@@ -104 +104 @@
   shared_client_.reset();
 }
-void IconWidget::connectService() {
+void TrayWidget::connectService() {
   LOG_MESSAGE_TRAY(_T("Reconnecting to the service..."));
   try {
@@ -114 +114 @@
   }
 }
-int IconWidget::inject(std::wstring command, std::wstring arguments, std::wstring splitter, bool escape, std::wstring &msg, std::wstring & perf) {
+int TrayWidget::inject(std::wstring command, std::wstring arguments, TCHAR splitter, bool escape, std::wstring &msg, std::wstring & perf) {
   if (shared_client_.get() == NULL) {
     LOG_ERROR_TRAY(_T("No active shared instance!"));
     return -1;
   }
-  return shared_client_->inject(command, arguments, splitter[0], escape, msg, perf);
-}
-
-
-
-void IconWidget::createDialog(HINSTANCE hInstance) {
+  return shared_client_->inject(command, arguments, splitter, escape, msg, perf);
+}
+
+
+
+void TrayWidget::createDialog(HINSTANCE hInstance) {
   ghInstance = hInstance;
   hDlgWnd = ::CreateDialog(hInstance,MAKEINTRESOURCE(IDD_NSTRAYDLG),NULL,TrayIcon::DialogProc);
@@ -160 +160 @@
 }
 
-void IconWidget::session_error(std::wstring file, unsigned int line, std::wstring msg) {
+void TrayWidget::session_error(std::wstring file, unsigned int line, std::wstring msg) {
   log(_T("error"), file.c_str(), line, msg);
 }
 
-void IconWidget::session_log_message(int msgType, const TCHAR* file, const int line, std::wstring message) {
+void TrayWidget::session_log_message(int msgType, const TCHAR* file, const int line, std::wstring message) {
   log(_T("message"), file, line, message);
 }
-void IconWidget::log(std::wstring category, const TCHAR* file, const int line, std::wstring message) {
+void TrayWidget::log(std::wstring category, const TCHAR* file, const int line, std::wstring message) {
   log_entry record(category, file, line, message);
   g_log_instance.log(_T("error"), record.file.c_str(), record.line, record.message.c_str());
@@ -193 +193 @@
 }
 
-IconWidget::log_type IconWidget::getLog() {
+TrayWidget::log_type TrayWidget::getLog() {
   log_type ret;
   for (log_type::const_iterator cit = log_.begin(); cit != log_.end(); ++cit)
@@ -286 +286 @@
       std::wstring perf;
       try {
-        int ret = gTrayInstance->inject(cmd, args, _T(" "), true, msg, perf);
+        int ret = gTrayInstance->inject(cmd, args, L' ', true, msg, perf);
         //NSCAPI::nagiosReturn ret = NSCModuleHelper::InjectSplitAndCommand(cmd, args, ' ', msg, perf);
         /*
@@ -450 +450 @@
 
 
-void insert_logrecord(HWND hwndLV, const IconWidget::log_entry &entry) {
+void insert_logrecord(HWND hwndLV, const TrayWidget::log_entry &entry) {
   LVITEM item;
   item.mask = LVIF_TEXT;
@@ -490 +490 @@
       col.pszText = _T("Message");
       ListView_InsertColumn(hwndLV, 4, &col);
-      IconWidget::log_type log = gTrayInstance->getLog();
-      for (IconWidget::log_type::const_iterator cit = log.begin(); cit != log.end(); ++cit) {
+      TrayWidget::log_type log = gTrayInstance->getLog();
+      for (TrayWidget::log_type::const_iterator cit = log.begin(); cit != log.end(); ++cit) {
         insert_logrecord(hwndLV, *cit);
       }
@@ -505 +505 @@
     {
       HWND hwndLV = GetDlgItem(hwndDlg, IDC_LOG);
-      const IconWidget::log_entry* record = reinterpret_cast<const IconWidget::log_entry*>(wParam);
+      const TrayWidget::log_entry* record = reinterpret_cast<const TrayWidget::log_entry*>(wParam);
       insert_logrecord(hwndLV, *record);
 

helpers/systray_helper/TrayWidget.h

@@ -28 +28 @@
 #define WM_MY_CLOSE WM_USER+2
 
-class IconWidget : public nsclient_session::session_handler_interface {
+class TrayWidget : public nsclient_session::session_handler_interface {
 public:
   struct log_entry {
@@ -50 +50 @@
 
 public:
-  IconWidget(std::wstring cmdLine);
-  ~IconWidget();
+  TrayWidget(std::wstring cmdLine);
+  ~TrayWidget();
   void createDialog(HINSTANCE hInstance);
   log_type getLog();
@@ -61 +61 @@
   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);
-  int session_inject(std::wstring command, std::wstring arguments, std::wstring splitter, bool escape, std::wstring &msg, std::wstring & perf) {
+  int session_inject(std::wstring command, std::wstring arguments, TCHAR splitter, bool escape, std::wstring &msg, std::wstring & perf) {
     return -1;
   }
@@ -68 +68 @@
   void setLogWindow(HWND hWnd) { hLogWnd = hWnd; }
   HWND getLogWindow() const { return hLogWnd; }
-  int inject(std::wstring command, std::wstring arguments, std::wstring splitter, bool escape, std::wstring &msg, std::wstring & perf);
+  int inject(std::wstring command, std::wstring arguments, TCHAR splitter, bool escape, std::wstring &msg, std::wstring & perf);
 
 

helpers/systray_helper/systray_helper.cpp

@@ -26 +26 @@
 
 
-  IconWidget widget(lpCmdLine);
+  TrayWidget widget(lpCmdLine);
   widget.createDialog(hInstance);
   return 0;

helpers/systray_helper/systray_helper.vcproj

@@ -218 +218 @@
       <Tool
         Name="VCLinkerTool"
-        OutputFile="$(OutDir)\systray.exe"
+        OutputFile="..\..\Release/systray.exe"
         LinkIncremental="1"
         GenerateDebugInformation="true"

include/NSCHelper.cpp

@@ -249 +249 @@
       break;
     default:
-      throw NSCMHExcpetion(_T("Unknown inject error."));
+      delete [] msgBuffer;
+      delete [] perfBuffer;
+      throw NSCMHExcpetion(_T("Unknown return code when injecting: ") + std::wstring(command));
   }
   delete [] msgBuffer;

include/NTService.h

@@ -24 +24 @@
 #include <sysinfo.h>
 
-
+namespace service_helper {
+  class service_exception {
+    std::wstring what_;
+  public:
+    service_exception(std::wstring what) : what_(what) {
+      OutputDebugString((std::wstring(_T("ERROR:")) + what).c_str());
+    }
+    std::wstring what() {
+      return what_;
+    }
+  };
 /**
  * @ingroup NSClient++
@@ -51 +61 @@
 class NTService : public TBase
 {
+public:
 private:
   HANDLE  hServerStopEvent;
   SERVICE_STATUS          ssStatus;
   SERVICE_STATUS_HANDLE   sshStatusHandle;
-  DWORD                   dwErr;
   SERVICE_TABLE_ENTRY *dispatchTable;
+  DWORD dwControlsAccepted;
+  std::wstring name_;
+  wchar_t *serviceName_;
 public:
-  NTService() : dispatchTable(NULL), hServerStopEvent(NULL), dwErr(0) {
-    // TODO This ought to be made dynamic somehow...
+  NTService(std::wstring name) : dispatchTable(NULL), hServerStopEvent(NULL), name_(name), dwControlsAccepted(SERVICE_ACCEPT_STOP) {
+    serviceName_ = new wchar_t[name.length()+2];
+    wcsncpy(serviceName_, name.c_str(), name.length());
     dispatchTable = new SERVICE_TABLE_ENTRY[2];
-    dispatchTable[0].lpServiceName = SZSERVICENAME;
+    dispatchTable[0].lpServiceName = serviceName_;
     dispatchTable[0].lpServiceProc = (LPSERVICE_MAIN_FUNCTION)TBase::service_main_dispatch;
     dispatchTable[1].lpServiceName = NULL;
@@ -68 +82 @@
   virtual ~NTService() {
     delete [] dispatchTable;
+    delete [] serviceName_;
   }
 
@@ -73 +88 @@
     BOOL ret = ::StartServiceCtrlDispatcher(dispatchTable);
     if (ret == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) {
-      std::wcout << "We are running in console mode, terminating..." << std::endl;
+      OutputDebugString(_T("We are running in console mode, terminating..."));
       return false;
     }
     return ret != 0;
   }
+
+
+
+  typedef DWORD (WINAPI *LPHANDLER_FUNCTION_EX) (
+    DWORD dwControl,     // requested control code
+    DWORD dwEventType,   // event type
+    LPVOID lpEventData,  // event data
+    LPVOID lpContext     // user-defined context data
+    );
+  typedef SERVICE_STATUS_HANDLE (WINAPI *REGISTER_SERVICE_CTRL_HANDLER_EX) (
+    LPCTSTR lpServiceName,                // name of service
+    LPHANDLER_FUNCTION_EX lpHandlerProc,  // handler function
+    LPVOID lpContext                      // user data
+    );
+
+  SERVICE_STATUS_HANDLE RegisterServiceCtrlHandlerEx_(LPCTSTR lpServiceName, LPHANDLER_FUNCTION_EX lpHandlerProc, LPVOID lpContext) {
+    HMODULE hAdvapi32 = NULL;
+    REGISTER_SERVICE_CTRL_HANDLER_EX fRegisterServiceCtrlHandlerEx = NULL;
+
+    if ((hAdvapi32 = GetModuleHandle(TEXT("Advapi32.dll"))) == NULL)
+      return 0;
+#ifdef _UNICODE
+    fRegisterServiceCtrlHandlerEx = (REGISTER_SERVICE_CTRL_HANDLER_EX)GetProcAddress(hAdvapi32, "RegisterServiceCtrlHandlerExW");
+#else
+    fRegisterServiceCtrlHandlerEx = (REGISTER_SERVICE_CTRL_HANDLER_EX)GetProcAddress(hAdvapi32, "RegisterServiceCtrlHandlerExA");
+#endif // _UNICODE
+    if (!fRegisterServiceCtrlHandlerEx)
+      return 0;
+    return fRegisterServiceCtrlHandlerEx(lpServiceName, lpHandlerProc, lpContext);
+  }
+
+
 
   void service_main(DWORD dwArgc, LPTSTR *lpszArgv)
   {
-    if (systemInfo::isAboveW2K(systemInfo::getOSVersion())) {
-      ssStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SESSIONCHANGE;
-      sshStatusHandle = RegisterServiceCtrlHandlerEx( SZSERVICENAME, TBase::service_ctrl_dispatch_ex, NULL);
+    OutputDebugString(_T("service_main launcing..."));
+    sshStatusHandle = RegisterServiceCtrlHandlerEx_(name_.c_str(), TBase::service_ctrl_dispatch_ex, NULL);
+    if (sshStatusHandle == 0) {
+      OutputDebugString(_T("Failed to register RegisterServiceCtrlHandlerEx_ (attempting to use normal one)..."));
+      sshStatusHandle = RegisterServiceCtrlHandler(name_.c_str(), TBase::service_ctrl_dispatch);
     } else {
-      // register our service control handler:
-      sshStatusHandle = RegisterServiceCtrlHandler( SZSERVICENAME, TBase::service_ctrl_dispatch);
-    }
-
-    // SERVICE_STATUS members that don't change in example
+      if (systemInfo::isAboveXP(systemInfo::getOSVersion()))
+        dwControlsAccepted |= SERVICE_ACCEPT_SESSIONCHANGE;
+      else
+        OutputDebugString(_T("Not >w2k so sessiong messages disabled..."));
+    }
+    ssStatus.dwControlsAccepted = dwControlsAccepted;
+    if (sshStatusHandle == 0)
+      throw service_exception(_T("Failed to register service: ") + error::lookup::last_error());
+
+
     ssStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
     ssStatus.dwServiceSpecificExitCode = 0;
 
     // report the status to the service control manager.
-    if (!ReportStatusToSCMgr(SERVICE_START_PENDING,NO_ERROR,3000)) {
-      if (sshStatusHandle)
-        ReportStatusToSCMgr(SERVICE_STOPPED,dwErr,0);
-    }
-
-    ServiceStart( dwArgc, lpszArgv );
-
-    // try to report the stopped status to the service control manager.
-    if (sshStatusHandle)
-      ReportStatusToSCMgr(SERVICE_STOPPED,dwErr,0);
+    if (!ReportStatusToSCMgr(SERVICE_START_PENDING,3000)) {
+      ReportStatusToSCMgr(SERVICE_STOPPED,0);
+      throw service_exception(_T("Failed to report service status: ") + error::lookup::last_error());
+    }
+    try {
+      OutputDebugString(_T("Attempting to start service..."));
+      ServiceStart(dwArgc, lpszArgv);
+    } catch (...) {
+      throw service_exception(_T("Uncaught exception in service... terminating: ") + error::lookup::last_error());
+    }
+    ReportStatusToSCMgr(SERVICE_STOPPED,0);
   }
 
@@ -119 +174 @@
     {
     case SERVICE_CONTROL_STOP:
-      ReportStatusToSCMgr(SERVICE_STOP_PENDING, NO_ERROR, 0);
+      ReportStatusToSCMgr(SERVICE_STOP_PENDING, 0);
       ServiceStop();
       return 0;
@@ -140 +195 @@
 
     }
-    ReportStatusToSCMgr(ssStatus.dwCurrentState, NO_ERROR, 0);
+    ReportStatusToSCMgr(ssStatus.dwCurrentState, 0);
     return 0;
   }
@@ -159 +214 @@
   *
   */
-  BOOL ReportStatusToSCMgr(DWORD dwCurrentState, DWORD dwWin32ExitCode, DWORD dwWaitHint) {
+  BOOL ReportStatusToSCMgr(DWORD dwCurrentState, DWORD dwWaitHint) {
     static DWORD dwCheckPoint = 1;
     BOOL fResult = TRUE;
@@ -166 +221 @@
       ssStatus.dwControlsAccepted = 0;
     else
-      ssStatus.dwControlsAccepted = SERVICE_ACCEPT_STOP| SERVICE_ACCEPT_SESSIONCHANGE;
+      ssStatus.dwControlsAccepted = dwControlsAccepted;
 
     ssStatus.dwCurrentState = dwCurrentState;
-    ssStatus.dwWin32ExitCode = dwWin32ExitCode;
+    ssStatus.dwWin32ExitCode = 0;
     ssStatus.dwWaitHint = dwWaitHint;
 
@@ -196 +251 @@
   void ServiceStart(DWORD dwArgc, LPTSTR *lpszArgv) {
     hServerStopEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
-    if (!ReportStatusToSCMgr(SERVICE_RUNNING,NO_ERROR,0)) {
+    if (!ReportStatusToSCMgr(SERVICE_RUNNING,0)) {
       if (hServerStopEvent)
         CloseHandle(hServerStopEvent);
@@ -228 +283 @@
   }
 };
+}

include/error.hpp

@@ -9 +9 @@
   public:
     static std::wstring from_system(unsigned long dwError) {
-      LPVOID lpMsgBuf;
+      LPVOID lpMsgBuf = NULL;
       unsigned long dwRet = FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,NULL,dwError,MAKELANGID(LANG_NEUTRAL,SUBLANG_DEFAULT),(LPTSTR)&lpMsgBuf,0,NULL);
       if (dwRet == 0) {
@@ -17 +17 @@
       wsprintf(szBuf, _T("%d: %s"), dwError, lpMsgBuf); 
       std::wstring str = szBuf;
+      delete [] szBuf;
       LocalFree(lpMsgBuf);
       return str;
@@ -29 +30 @@
       wsprintf(szBuf, _T("%d: %s"), dwError, lpMsgBuf); 
       std::wstring str = szBuf;
+      delete [] szBuf;
       LocalFree(lpMsgBuf);
       return str;
@@ -47 +49 @@
       wsprintf(szBuf, _T("%d: %s"), dwError, lpMsgBuf); 
       std::wstring str = szBuf;
+      delete [] szBuf;
       LocalFree(lpMsgBuf);
       FreeLibrary(hevt);

include/execute_process.hpp

@@ -146 +146 @@
       DWORD error = GetLastError();
       if (error == ERROR_BAD_EXE_FORMAT) {
-        NSC_LOG_ERROR_STD(command + _T(" is not an .exe file or a valid image (if you run a script you usually need to prefix the command with the interpreter like so: \"command=c:\perl.exe <script>\""));
+        NSC_LOG_ERROR_STD(command + _T(" is not an .exe file or a valid image (if you run a script you usually need to prefix the command with the interpreter like so: \"command=c:\\perl.exe <script>\""));
         msg = _T("ExternalCommands: failed to create process (") + command + _T("): it is not an exe file (check NSC.log for more info) - ") + error::lookup::last_error(error);
       } else {

include/nsclient_session.hpp

@@ -25 +25 @@
     virtual void session_error(std::wstring file, unsigned int line, std::wstring msg) = 0;
     virtual void session_log_message(int msgType, const TCHAR* file, const int line, std::wstring message) = 0;
-    virtual int session_inject(std::wstring command, std::wstring arguments, std::wstring splitter, bool escape, std::wstring &msg, std::wstring & perf) = 0;
+    virtual int session_inject(std::wstring command, std::wstring arguments, TCHAR splitter, bool escape, std::wstring &msg, std::wstring & perf) = 0;
   };
 
@@ -650 +650 @@
       remote_channel::local_message_type msg;
       msg.command = message_inject;
+      error(__FILEW__, __LINE__, _T("splitter") + strEx::ctos(splitter));
+      error(__FILEW__, __LINE__, _T("splitter") + splitter);
+      
       msg.arguments.push_back(command);
       msg.arguments.push_back(arguments);
       msg.arguments.push_back(strEx::ctos(splitter));
       msg.arguments.push_back(escape?_T("1"):_T("0"));
+
+      error(__FILEW__, __LINE__, _T("arg1") + msg.arguments[1]);
+      error(__FILEW__, __LINE__, _T("arg2") + msg.arguments[2]);
+      error(__FILEW__, __LINE__, _T("arg3") + msg.arguments[3]);
 
       unsigned int msg_id = send_server(msg);
@@ -772 +779 @@
         if (msg.arguments.size() == 4) {
           try {
-            ret = handler_->session_inject(msg.arguments[0], msg.arguments[1], msg.arguments[2], msg.arguments[2]==_T("1"), message, perf);
+            error(__FILEW__, __LINE__, _T("arg1") + msg.arguments[1]);
+            error(__FILEW__, __LINE__, _T("arg2") + msg.arguments[2]);
+            error(__FILEW__, __LINE__, _T("arg3") + msg.arguments[3]);
+            ret = handler_->session_inject(msg.arguments[0], msg.arguments[1], strEx::stoc(msg.arguments[2]), msg.arguments[2]==_T("1"), message, perf);
           } catch (...) {
             message = _T("Unknown exception!");

include/strEx.h

@@ -214 +214 @@
   }
   inline std::wstring ctos(TCHAR c) {
-    return std::wstring(c,1);
+    return std::wstring(1, c);
+  }
+  inline TCHAR stoc(std::wstring str) {
+    if (str.length() == 0)
+      return L' ';
+    return str[0];
   }
   inline std::wstring itos(unsigned int i) {

include/sysinfo.h

@@ -58 +58 @@
     return ((osVersion.dwPlatformId == VER_PLATFORM_WIN32_NT)&&(osVersion.dwMajorVersion>4));
   }
+  inline bool isAboveXP(const OSVERSIONINFO &osVersion) {
+    if ((osVersion.dwPlatformId == VER_PLATFORM_WIN32_NT) && (osVersion.dwMajorVersion>=4)&&(osVersion.dwMinorVersion>=1))
+      return true;
+    return false;
+  }
+  inline bool isBelowXP(const OSVERSIONINFO &osVersion) {
+    if ((osVersion.dwPlatformId == VER_PLATFORM_WIN32_NT) && (osVersion.dwMajorVersion<4))
+      return true;
+    if ((osVersion.dwPlatformId == VER_PLATFORM_WIN32_NT) && (osVersion.dwMajorVersion==4)&&(osVersion.dwMinorVersion<1))
+      return true;
+    return false;
+  }
 
 }

modules/CheckDisk/CheckDisk.cpp

@@ -530 +530 @@
   CheckFileContainer query;
   std::wstring syntax = _T("%filename%");
+  std::wstring alias;
   bool bPerfData = true;
 
@@ -539 +540 @@
       MAP_OPTIONS_STR(_T("syntax"), syntax)
       MAP_OPTIONS_PUSH(_T("path"), paths)
+      MAP_OPTIONS_STR(_T("alias"), alias)
       MAP_OPTIONS_PUSH(_T("file"), paths)
       MAP_OPTIONS_BOOL_EX(_T("filter"), finder.bFilterIn, _T("in"), _T("out"))
@@ -569 +571 @@
   if (finder.error)
     return NSCAPI::returnUNKNOWN;
-  query.alias = finder.alias;
+  if (!alias.empty())
+    query.alias = alias;
+  else
+    query.alias = finder.alias;
+  if (query.alias.empty())
+    query.alias = _T("no files found");
   query.runCheck(finder.hit_count, returnCode, message, perf);
   if ((truncate > 0) && (message.length() > (truncate-4)))

modules/CheckEventLog/CheckEventLog.cpp

@@ -405 +405 @@
   bool bFilterIn = true;
   bool bFilterAll = false;
-  bool bFilterNew = false;
+  bool bFilterNew = true;
   bool bShowDescriptions = false;
   bool unique = false;
@@ -471 +471 @@
 
   unsigned long int hit_count = 0;
+  if (files.empty()) {
+    message = _T("No file specified try adding: file=Application");
+    return NSCAPI::returnUNKNOWN;
+  }
 
   for (std::list<std::wstring>::const_iterator cit2 = files.begin(); cit2 != files.end(); ++cit2) {
@@ -502 +506 @@
 
         if (filter_chain.empty()) {
-          message = _T("No filters specified.");
+          message = _T("No filters specified try adding: filter+generated=>2d");
           return NSCAPI::returnUNKNOWN;
         }

modules/CheckSystem/CheckSystem.cpp

@@ -341 +341 @@
 
   static std::wstring get_perf_unit(__int64 value) {
-    return _T("");
+    return _T("%");
   }
   static std::wstring print_perf(__int64 value, std::wstring unit) {

modules/FileLogger/FileLogger.cpp

@@ -40 +40 @@
 }
 
-std::wstring FileLogger::getFileName()
-{
+#ifndef CSIDL_COMMON_APPDATA 
+#define CSIDL_COMMON_APPDATA 0x0023 
+#endif
+typedef BOOL (WINAPI *fnSHGetSpecialFolderPath)(HWND hwndOwner, LPTSTR lpszPath, int nFolder, BOOL fCreate);
+
+__inline BOOL WINAPI _SHGetSpecialFolderPath(HWND hwndOwner, LPTSTR lpszPath, int nFolder, BOOL fCreate) {
+  static fnSHGetSpecialFolderPath __SHGetSpecialFolderPath = NULL;
+  if (!__SHGetSpecialFolderPath) {
+    HMODULE hDLL = LoadLibrary(_T("shfolder.dll"));
+    if (hDLL != NULL)
+      __SHGetSpecialFolderPath = (fnSHGetSpecialFolderPath)GetProcAddress(hDLL,"SHGetSpecialFolderPathW");
+  }
+  if(__SHGetSpecialFolderPath)
+    return __SHGetSpecialFolderPath(hwndOwner, lpszPath, nFolder, fCreate);
+  return FALSE;
+}
+
+std::wstring getFolder(std::wstring key) {
+  if (key == _T("exe")) {
+    return NSCModuleHelper::getBasePath();
+  } else {
+    if (key == _T("local-app-data")) {
+      TCHAR buf[MAX_PATH+1];
+      _SHGetSpecialFolderPath(NULL, buf, CSIDL_COMMON_APPDATA, FALSE);
+      return buf;
+    }
+  }
+  return NSCModuleHelper::getBasePath();
+}
+std::wstring FileLogger::getFileName() {
   if (file_.empty()) {
     file_ = NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_FILENAME, LOG_FILENAME_DEFAULT);
-    if (file_.find(_T("\\")) == std::wstring::npos)
-      file_ = NSCModuleHelper::getBasePath() + _T("\\") + file_;
+    if (file_.find(_T("\\")) == std::wstring::npos) {
+      std::wstring root = getFolder(NSCModuleHelper::getSettingsString(LOG_SECTION_TITLE, LOG_ROOT, LOG_ROOT_DEFAULT));
+      std::wstring::size_type pos = root.find_last_not_of(L'\\');
+      if (pos != std::wstring::npos) {
+        //root = root.substr(0, pos);
+      }
+      file_ = root + _T("\\") + file_;
+    }
   }
   return file_;
@@ -57 +91 @@
   std::wstring hello = _T("Starting to log for: ") + NSCModuleHelper::getApplicationName() + _T(" - ") + NSCModuleHelper::getApplicationVersionString();
   handleMessage(NSCAPI::log, __FILEW__, __LINE__, hello.c_str());
+  NSC_LOG_MESSAGE_STD(_T("Log path is: ") + file_ );
   return true;
 }
@@ -68 +103 @@
   return true;
 }
+HANDLE openAppendOrNew(std::wstring file) {
+  DWORD numberOfBytesWritten = 0;
+  HANDLE hFile = ::CreateFile(file.c_str(), GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+  if (hFile == INVALID_HANDLE_VALUE) {
+    hFile = ::CreateFile(file.c_str(), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+    if (hFile != INVALID_HANDLE_VALUE) {
+      WORD wBOM = 0xFEFF;
+      ::WriteFile(hFile, &wBOM, sizeof(WORD), &numberOfBytesWritten, NULL);
+    }
+  }
+  return hFile;
+}
 void FileLogger::writeEntry(std::wstring line) {
   DWORD numberOfBytesWritten;
-  HANDLE hFile = ::CreateFile(file_.c_str(), GENERIC_WRITE, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+  HANDLE hFile = openAppendOrNew(file_);
   if (hFile == INVALID_HANDLE_VALUE) {
-    hFile = ::CreateFile(file_.c_str(), GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
-    if (hFile == INVALID_HANDLE_VALUE) {
-      std::wcout << _T("Failed to write to log file: ") << file_ << std::endl;
-      return;
-    }
-    WORD wBOM = 0xFEFF;
-    ::WriteFile(hFile, &wBOM, sizeof(WORD), &numberOfBytesWritten, NULL);
+    if (line.find(_T("can not log to file")) != std::wstring::npos)
+      NSC_LOG_MESSAGE_STD(_T("Failed to create log file and temporary log! (can not log to file): ") + file_ );
+    return;
   }
-  //::WriteFile(hFile, &wBOM, sizeof(WORD), &NumberOfBytesWritten, NULL);
   if (::SetFilePointer(hFile, 0, NULL, FILE_END) == INVALID_SET_FILE_POINTER) {
     std::wcout << _T("Failed to move pointer to end of file...") << std::endl;
@@ -89 +131 @@
 
 void FileLogger::handleMessage(int msgType, TCHAR* file, int line, const TCHAR* message) {
-  if (!init_)
+  if (!init_) {
+    std::wcout << _T("Discarding message (not initzialized yet") << std::endl;
     return;
+  }
   TCHAR buffer[65];
   __time64_t ltime;

modules/LUAScript/script_wrapper.hpp

@@ -355 +355 @@
 
       lua_createtable(L, 0, argLen);
-      for (int i=0;i<argLen;i++) {
+      for (unsigned int i=0;i<argLen;i++) {
         lua_pushnumber(L,i+1);
         lua_pushstring(L,strEx::wstring_to_string(char_args[i]).c_str());

modules/NSCAAgent/NSCAAgent-2005.vcproj

@@ -234 +234 @@
         Name="VCLinkerTool"
         AdditionalDependencies="ws2_32.lib Crypto++.lib"
-        OutputFile="$(OutDir)\$(ProjectName).dll"
+        OutputFile="../../Release/modules/$(ProjectName).dll"
         LinkIncremental="1"
         AdditionalLibraryDirectories="$(SolutionDir)lib\$(ConfigurationName)\$(PlatformName)"

modules/NSCAAgent/NSCAThread.cpp

@@ -182 +182 @@
       crypt_inst.encrypt_init(password_.c_str(),encryption_method_,reinterpret_cast<unsigned char*>(packet_in->iv));
     } catch (nsca_encrypt::encryption_exception &e) {
-      NSC_LOG_ERROR_STD(_T("<<< Failed to initalize encryption header: ") + e.getMessage());
+      NSC_LOG_ERROR_STD(_T("<<< NSCA Encryption header missmatch (hint: if you dont use NSCA dot use the NSCA module): ") + e.getMessage());
       return;
     } catch (...) {
-      NSC_LOG_ERROR_STD(_T("<<< Failed to initalize encryption header!"));
+      NSC_LOG_ERROR_STD(_T("<<< NSCA Encryption header missmatch (hint: if you dont use NSCA dot use the NSCA module)!"));
       return;
     }
@@ -206 +206 @@
     socket.close();
   } catch (...) {
-    NSC_LOG_ERROR_STD(_T("<<< Failed to initalize encryption header!"));
+    NSC_LOG_ERROR_STD(_T("<<< NSCA Configuration missmatch (hint: if you dont use NSCA dot use the NSCA module)!"));
     return;
   }

modules/SysTray/SysTray.cpp

@@ -43 +43 @@
 }
 bool SysTray::loadModule() {
-  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) {
+  if (NSCModuleHelper::getSettingsInt(MAIN_SECTION_TITLE, MAIN_SHARED_SESSION, MAIN_SHARED_SESSION_DEFAULT) == 1) {
+    NSC_LOG_ERROR(_T("You have enabled shared session, systray module will not load..."));
+    return true;
+  }
+  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;
     }
-    show();
-  } else {
-    NSC_LOG_ERROR(_T("SysTray module is not used on windows XP and above (so you can remove it)."));
+  } 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();
   return true;
 }

scripts/test.lua

@@ -1 @@
---require("luacom")
---require("luacom")
---require("luacom-lua5-13")
-
 nscp.print('Loading test script...')
--- win = loadlib("win32.dll","luaopen_w32")
--- print(win) -- nil
-require( 'w32' )
-nscp.print(w32)
-nscp.print(w32.FindWindow)
 
 nscp.execute('version')
@@ -22 +13 @@
 function something (command)
   nscp.print(command)
-  --code, msg, perf = inject('CheckCPU','time=5','MaxCrit=5')
-  msg = 'hello'
-  perf = 'hello'
-  code = 'ok'
+  code, msg, perf = nscp.execute('CheckCPU','time=5','MaxCrit=5')
   print(code .. ': ' .. msg .. ', ' .. perf)
   collectgarbage ()