Changeset a34b229 in nscp

Timestamp:

09/09/08 10:11:36 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

7221dc8

Parents:

dc59b0e

Message:

2008-09-09 MickeM

• Fixed issue with & and some commands via check_nt.
• Fixed a crash on exit (which I added in Rc1).
• Added 10 "bytes" the CPU buffer: (#174) + Added new option to [EventLog?] section buffer_size to change the size of the buffer used when scanning the evenlotg (defaults to 64k).
• Fixed error handling in CHeckEventLog so errors are repoorted properly (#184)

Files:

• AutoBuild.h (modified) (1 diff)
• NSC.dist (modified) (1 diff)
• NSCPlugin.cpp (modified) (3 diffs)
• NSCPlugin.h (modified) (1 diff)
• NSClient++-2005.sln (modified) (3 diffs)
• NSClient++-2005.vcproj (modified) (2 diffs)
• NSClient++.cpp (modified) (15 diffs)
• NSClient++.rc (modified) (3 diffs)
• changelog (modified) (1 diff)
• helpers/systray_helper/ReadMe.txt (deleted)
• helpers/systray_helper/TrayWidget.cpp (modified) (10 diffs)
• helpers/systray_helper/TrayWidget.h (modified) (1 diff)
• helpers/systray_helper/res/standby.ico (added)
• include/NSCHelper.cpp (modified) (1 diff)
• include/NSCHelper.h (modified) (1 diff)
• include/NTService.h (modified) (3 diffs)
• include/config.h (modified) (1 diff)
• include/nsclient_session.hpp (modified) (3 diffs)
• include/sysinfo.h (modified) (1 diff)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (6 diffs)
• modules/CheckEventLog/CheckEventLog.h (modified) (1 diff)
• modules/CheckSystem/PDHCollector.cpp (modified) (1 diff)
• modules/NSClientListener/NSClientListener.cpp (modified) (4 diffs)
• modules/SysTray/res/standby.ico (modified) (previous)
• res/standby.ico (modified) (previous)
• resource.h (added)

AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,4,4
-#define PRODUCTVER     0,3,4,4
-#define STRFILEVER     _T("0.3.4.4")
-#define STRPRODUCTVER  _T("0.3.4.4")
-#define STRPRODUCTDATE  _T("2008-09-08")
+#define FILEVER        0,3,4,23
+#define PRODUCTVER     0,3,4,23
+#define STRFILEVER     _T("0.3.4.23")
+#define STRPRODUCTVER  _T("0.3.4.23")
+#define STRPRODUCTDATE  _T("2008-09-09")
 #endif // AUTOBUILD_H

NSC.dist

@@ -300 +300 @@
 check_other=-H 192.168.0.1 -p 5666 -c remote_command -a arguments
 
+;# LUA SCRIPT SECTION
+;  A list of all Lua scripts to load.
+;[LUA Scripts]
+;scripts\test.lua

NSCPlugin.cpp

@@ -45 +45 @@
   ,fHideTray(NULL)
   ,bLoaded_(false)
+  ,lastIsMsgPlugin_(false)
 {
 }
@@ -63 +64 @@
   ,fHideTray(NULL)
   ,bLoaded_(false)
+  ,lastIsMsgPlugin_(false)
 {
   if (other.bLoaded_) {
@@ -179 +181 @@
     throw NSPluginException(file_, _T("Module not loaded"));
   try {
-    if (fHasMessageHandler())
+    if (fHasMessageHandler()) {
+      lastIsMsgPlugin_ = true;
       return true;
+    }
     return false;
   } catch (...) {

NSCPlugin.h

@@ -160 +160 @@
     return ret;
   }
+  bool getLastIsMsgPlugin() {
+    return lastIsMsgPlugin_;
+  }
 
 private:
+  bool lastIsMsgPlugin_;
   bool isLoaded() const {
     return bLoaded_;

NSClient++-2005.sln

@@ -139 +139 @@
   EndProjectSection
   ProjectSection(ProjectDependencies) = postProject
+    {BA246C01-063A-4548-8957-32D5CC76171B} = {BA246C01-063A-4548-8957-32D5CC76171B}
+    {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D}
+    {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F} = {8F1C3E39-D6C6-4414-AAD2-FE03C9A8655F}
+    {43718644-173B-42D8-8AD1-E359BFB2BB20} = {43718644-173B-42D8-8AD1-E359BFB2BB20}
+    {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129} = {0BEEC749-0E3E-4FB2-82DA-AC8D4730A129}
+    {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D} = {2FCAF54B-AAD3-4F59-895A-8F9CEAFDC65D}
+    {BBFF8362-C626-4838-B0A2-F695D638AD24} = {BBFF8362-C626-4838-B0A2-F695D638AD24}
+    {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4} = {626EB00E-A4D2-4B02-9BF4-4C655CA2B7E4}
+    {08D6246D-1B4A-47A3-965D-296DCC54A4E8} = {08D6246D-1B4A-47A3-965D-296DCC54A4E8}
+    {F3401E75-60FB-4A0E-A18C-6505587D5B1A} = {F3401E75-60FB-4A0E-A18C-6505587D5B1A}
+    {26B84883-BE52-40E6-9BEE-55AD056D5751} = {26B84883-BE52-40E6-9BEE-55AD056D5751}
+    {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}
+    {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}") = "UploadInstaller", "helpers\UploadInstaller\UploadInstaller.vcproj", "{6206F046-3D36-4258-BB03-3291A7070117}"
+  ProjectSection(WebsiteProperties) = preProject
+    Debug.AspNetCompiler.Debug = "True"
+    Release.AspNetCompiler.Debug = "False"
+  EndProjectSection
+  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
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UploadInstaller", "helpers\UploadInstaller\UploadInstaller.vcproj", "{6206F046-3D36-4258-BB03-3291A7070117}"
+    {A3CF4E23-1D1B-4D93-A16A-48C52D118560} = {A3CF4E23-1D1B-4D93-A16A-48C52D118560}
+  EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UploadBinaries", "helpers\UploadBinaries\UploadBinaries.vcproj", "{D96F7075-F6CD-4921-B5D8-8488E2D24BDB}"
   ProjectSection(WebsiteProperties) = preProject
     Debug.AspNetCompiler.Debug = "True"
@@ -150 +176 @@
   ProjectSection(ProjectDependencies) = postProject
     {2286162D-7571-4735-BAC8-4A8D33A4F42D} = {2286162D-7571-4735-BAC8-4A8D33A4F42D}
-    {A3CF4E23-1D1B-4D93-A16A-48C52D118560} = {A3CF4E23-1D1B-4D93-A16A-48C52D118560}
-  EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UploadBinaries", "helpers\UploadBinaries\UploadBinaries.vcproj", "{D96F7075-F6CD-4921-B5D8-8488E2D24BDB}"
-  ProjectSection(WebsiteProperties) = preProject
-    Debug.AspNetCompiler.Debug = "True"
-    Release.AspNetCompiler.Debug = "False"
-  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
 EndProject
@@ -1173 +1189 @@
     {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}
-    {A3CF4E23-1D1B-4D93-A16A-48C52D118560} = {9A087442-7BB2-4CF0-9F58-5D1BC3C32CD2}
     {630857C0-6AD8-4CEE-B5F7-CA1DF620CA9A} = {C8DCE3D7-A802-4C5D-ABB1-B478F545B6E5}
     {B6D08289-B8AE-4391-9D07-93B22618BE58} = {C8DCE3D7-A802-4C5D-ABB1-B478F545B6E5}

NSClient++-2005.vcproj

@@ -2429 +2429 @@
       </File>
       <File
+        RelativePath=".\resource.h"
+        >
+      </File>
+      <File
         RelativePath=".\include\ServiceCmd.h"
         >
@@ -2469 +2473 @@
       Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
       >
+      <File
+        RelativePath=".\NSClient++.rc"
+        >
+      </File>
+      <File
+        RelativePath=".\res\standby.ico"
+        >
+      </File>
     </Filter>
     <Filter

NSClient++.cpp

@@ -189 +189 @@
       } catch (const serviceControll::SCException& e) {
         LOG_MESSAGE_STD(_T("Couldn't set service description: ") + e.error_);
+        return -1;
       }
       LOG_MESSAGE(_T("Service installed!"));
+      return 0;
     } else if ( _wcsicmp( _T("uninstall"), argv[1]+1 ) == 0 ) {
       g_bConsoleLog = true;
@@ -197 +199 @@
       } catch (const serviceControll::SCException& e) {
         LOG_MESSAGE_STD(_T("Service deinstallation failed; ") + e.error_);
-        return -1;
       }
       LOG_MESSAGE(_T("Service uninstalled!"));
+      return 0;
     } else if ( _wcsicmp( _T("encrypt"), argv[1]+1 ) == 0 ) {
       g_bConsoleLog = true;
@@ -521 +523 @@
 
 bool NSClientT::exitCore(bool boot) {
+  plugins_loaded_ = false;
   LOG_MESSAGE(_T("Attempting to stop NSCLient++ - " SZVERSION));
   if (boot) {
@@ -527 +530 @@
       mainClient.unloadPlugins(false);
     } catch(NSPluginException e) {
-      std::wcout << _T("Exception raised: ") << e.error_ << _T(" in module: ") << e.file_ << std::endl;;
+      LOG_ERROR_STD(_T("Exception raised when unloading non msg plguins: ") + e.error_ + _T(" in module: ") + e.file_);
     } catch(...) {
-      std::wcout << _T("UNknown exception raised: ") << std::endl;;
+      LOG_ERROR_STD(_T("Unknown exception raised when unloading non msg plugins"));
     }
   }
@@ -557 +560 @@
     }
   } catch(nsclient_session::session_exception &e) {
-    std::wcout << _T("Exception closing shared client session: ") << e.what() << std::endl;;
+    LOG_ERROR_STD(_T("Exception closing shared client session: ") + e.what());
   } catch(...) {
-    std::wcout << _T("Exception closing shared client session: Unknown exception!") << std::endl;;
+    LOG_ERROR_STD(_T("Exception closing shared client session: Unknown exception!"));
   }
   try {
@@ -568 +571 @@
     }
   } catch(...) {
-    std::wcout << _T("UNknown exception raised: ") << std::endl;;
+    LOG_ERROR_STD(_T("UNknown exception raised: When closing shared session"));
   }
   if (boot) {
@@ -575 +578 @@
       mainClient.unloadPlugins(true);
     } catch(NSPluginException e) {
-      std::wcout << _T("Exception raised: ") << e.error_ << _T(" in module: ") << e.file_ << std::endl;;
+      LOG_ERROR_STD(_T("Exception raised when unloading msg plugins: ") + e.error_ + _T(" in module: ") + e.file_);
     } catch(...) {
-      std::wcout << _T("UNknown exception raised: ") << std::endl;;
+      LOG_ERROR_STD(_T("UNknown exception raised: When stopping message plguins"));
     }
   }
@@ -713 +716 @@
       return;
     }
-    for (pluginList::size_type i=plugins_.size();i>0;i--) {
-      NSCPlugin *p = plugins_[i-1];
+    for (pluginList::reverse_iterator it = plugins_.rbegin(); it != plugins_.rend(); ++it) {
+      NSCPlugin *p = *it;
+      if (p == NULL)
+        continue;
       if (!unloadLoggers && p->hasMessageHandler()) {
         LOG_DEBUG_STD(_T("Skipping log plugin: ") + p->getModule() + _T("..."));
@@ -729 +734 @@
       return;
     }
-    for (pluginList::size_type i=plugins_.size();i>0;i--) {
-      NSCPlugin *p = plugins_[i-1];
-      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();
+    for (pluginList::iterator it = plugins_.begin(); it != plugins_.end(); ++it) {
+      NSCPlugin *p = (*it);
+      if (p == NULL)
+        continue;
+      try {
+        if (unloadLoggers || !p->getLastIsMsgPlugin()) {
+          *it = NULL;
+          delete p;
+          it = plugins_.erase(it);
+        }
+      } catch(NSPluginException e) {
+        LOG_ERROR_STD(_T("Exception raised when unloading plugin: ") + e.error_ + _T(" in module: ") + e.file_);
+      } catch(...) {
+        LOG_ERROR_STD(_T("Unknown exception raised when unloading plugin"));
+      }
+    }
   }
 }
@@ -948 +958 @@
 }
 
+void log_broken_message(std::wstring msg) {
+  OutputDebugString(msg.c_str());
+  std::wcout << msg << std::endl;
+}
 /**
  * Report a message to all logging enabled modules.
@@ -964 +978 @@
       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;
+      log_broken_message(_T("Failed to send message to clients: ") + e.what());
     }
   }
@@ -974 +988 @@
     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;
+      log_broken_message(_T("Message was lost as the (mutexRW) core was locked: ") + message);
       return;
     }
     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;
+      log_broken_message(_T("Message was lost as the core was locked: ") + message);
       return;
     }
@@ -1012 +1022 @@
     } 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++) {
@@ -1018 +1027 @@
               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_broken_message(_T("Caught: ") + e.error_ + _T(" when trying to log a message..."));
+              return;
+            } catch(...) {
+              log_broken_message(_T("Caught: Unknown Exception when trying to log a message..."));
+              return;
             }
           }
@@ -1030 +1041 @@
           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;
+          log_broken_message(_T("Caught: ") + e.error_ + _T(" when trying to log a message..."));
+          return;
+        } catch(...) {
+          log_broken_message(_T("Caught: Unknown Exception when trying to log a message..."));
+          return;
         }
       }

NSClient++.rc

@@ -30 +30 @@
 // remains consistent on all systems.
 IDI_STANDBY             ICON                    "res/standby.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-
 #endif    // English (U.S.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE 
-BEGIN
-    IDS_HELLO               "Hello from MFC!"
-END
-
-#endif    // French (France) resources
 /////////////////////////////////////////////////////////////////////////////
 
@@ -84 +43 @@
 #endif //_WIN32
 
+#ifdef APSTUDIO_INVOKED
 /////////////////////////////////////////////////////////////////////////////
 //
-// DESIGNINFO
+// TEXTINCLUDE
 //
 
+1 TEXTINCLUDE 
+BEGIN
+    "resource.\0"
+END
 
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
 
+3 TEXTINCLUDE 
+BEGIN
+    "\r\0"
+END
+
+#endif    // APSTUDIO_INVOKED
 
 #endif    // Swedish resources
@@ -101 +67 @@
 
 
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

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-09 MickeM
+ * Fixed issue with & and some commands via check_nt.
+ * Fixed a crash on exit (which I added in Rc1).
+ * Added 10 "bytes" the CPU buffer: (#174)
+ + Added new option to [EventLog] section buffer_size to change the size of the buffer used when scanning the evenlotg (defaults to 64k).
+ * Fixed error handling in CHeckEventLog so errors are repoorted properly (#184)
+
+2008-09-08 MickeM
+ * Fixed issue in windows 2008 with system tray (shared_session).
+ * Fixed installer issue (should run (i hope) service installer on install now on 64 bit os)
+ * Fixed issue with unloading plugins and log (causing "timeouts" when exiting some times)
 
 2008-09-07 MickeM

helpers/systray_helper/TrayWidget.cpp

@@ -33 +33 @@
 
 logging::file_logger g_log_instance(_T("nsclient++"),_T("systray.log"));
+HINSTANCE ghInstance = NULL;
+TrayWidget *gTrayInstance = NULL;
 
 #define LOG_ERROR_FILE(x) g_log_instance.log(_T("error"), __FILEW__, __LINE__, std::wstring(x).c_str());
@@ -41 +43 @@
 
 #define LOG_ERROR_TO_TRAY(x) gTrayInstance->log(_T("error"), __FILEW__, __LINE__, std::wstring(x).c_str());
+#define LOG_MESSAGE_TO_TRAY(x) gTrayInstance->log(_T("message"), __FILEW__, __LINE__, std::wstring(x).c_str());
 
 #if WINVER < 0x0600
@@ -52 +55 @@
     HMODULE hMod = GetModuleHandle(TEXT("user32"));
     if (hMod == NULL)
-      return false;
+      return FALSE;
     fnChangeWindowMessageFilter = (LPFN_CHANGEWINDOWMESSAGEFILTER)GetProcAddress(hMod,"ChangeWindowMessageFilter");
   }
   if (fnChangeWindowMessageFilter == NULL) {
-    return true;
-  }
+    LOG_ERROR_FILE(_T("Could not find ChangeWindowMessageFilter: ") + error::lookup::last_error());
+    return TRUE;
+  }
+  LOG_ERROR_FILE(_T("registred windows thingy..."));
   return fnChangeWindowMessageFilter(message,what);
 }
@@ -72 +77 @@
   return _T("");
 }
-HINSTANCE ghInstance = NULL;
-TrayWidget *gTrayInstance = NULL;
 TrayWidget::TrayWidget(std::wstring cmdLine) {
   strEx::splitList list = strEx::splitEx(cmdLine, _T(" "));
@@ -124 +127 @@
 
 
+
 void TrayWidget::createDialog(HINSTANCE hInstance) {
+  LOG_MESSAGE_TRAY(_T("Creating dialog..."));
   ghInstance = hInstance;
-  hDlgWnd = ::CreateDialog(hInstance,MAKEINTRESOURCE(IDD_NSTRAYDLG),NULL,TrayIcon::DialogProc);
-  if ((hDlgWnd == NULL)||!IsWindow(hDlgWnd)) {
-    LOG_ERROR_TRAY(_T("Failed to create windows: ") + error::lookup::last_error());
-  }
+  //hDlgWnd = ::CreateDialog(hInstance,MAKEINTRESOURCE(IDD_NSTRAYDLG),NULL,TrayIcon::DialogProc);
+  //if ((hDlgWnd == NULL)||!IsWindow(hDlgWnd)) {
+//    LOG_ERROR_TRAY(_T("Failed to create windows: ") + error::lookup::last_error());
+//  }
+
+  WNDCLASSEX wndclass;
+  wndclass.lpszMenuName=NULL;
+  wndclass.cbSize=sizeof(wndclass);
+  wndclass.lpfnWndProc=TrayIcon::DialogProc;
+  wndclass.cbClsExtra=0;
+  wndclass.cbWndExtra=0;
+  wndclass.hInstance=hInstance;
+  wndclass.hIcon=NULL;
+  wndclass.hbrBackground=(HBRUSH)GetStockObject(WHITE_BRUSH);
+  wndclass.hCursor=LoadCursor(NULL,IDC_ARROW);
+  wndclass.hIconSm=NULL;
+  wndclass.lpszClassName=_T("NSClient_pp_TrayClass");
+  wndclass.style=0;
+  // register task bar restore event after crash
+  //WM_TASKBARCREATED=RegisterWindowMessage(TEXT("TaskbarCreated"));
+  //MyChangeWindowMessageFilter(WM_TASKBARCREATED, MSGFLT_ADD); 
 
   UINT UDM_TASKBARCREATED = RegisterWindowMessage(_T("TaskbarCreated"));
@@ -139 +161 @@
   }
 
+  if (!RegisterClassEx(&wndclass)) {
+    LOG_ERROR_TRAY(_T("Failed to register window class: ") + error::lookup::last_error());
+  }
+
+  MSG msg;
+  hDlgWnd=CreateWindow(_T("NSClient_pp_TrayClass"),NULL,0,CW_USEDEFAULT,CW_USEDEFAULT,CW_USEDEFAULT,CW_USEDEFAULT,NULL,NULL,hInstance,NULL);
+  if(hDlgWnd==NULL)
+  {
+    LOG_ERROR_TRAY(_T("Failed to create window: ") + error::lookup::last_error());
+    return;
+  }
+  while(GetMessage(&msg,NULL,0,0))
+  {
+    if (msg.message == WM_MY_CLOSE) {
+      ::DestroyWindow(hDlgWnd);
+    } else if (msg.message == UDM_TASKBARCREATED) {
+      LOG_MESSAGE_TRAY(_T("Recreating systray icon..."));
+      TrayIcon::addIcon(msg.hwnd);
+    } else {
+      TranslateMessage(&msg);
+      DispatchMessage(&msg);
+    }
+  }
+  return;
+  
+  /*
   MSG Msg;
   BOOL bRet;
@@ -158 +206 @@
     } 
   }
+  */
 }
 
@@ -529 +578 @@
 namespace TrayIcon
 {
+  UINT UDM_TASKBARCREATED = -1;
   HMENU hPopupMenu_ = NULL;
 }
-INT_PTR CALLBACK TrayIcon::DialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
+//LRESULT CALLBACK WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
+LRESULT CALLBACK TrayIcon::DialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam)
 {
+  if (uMsg == UDM_TASKBARCREATED) {
+    addIcon(hwndDlg);
+    LOG_MESSAGE_TO_TRAY(_T("UDM_TASKBARCREATED"));
+  }
+
   switch (uMsg) 
   {
@@ -542 +598 @@
     return 0;
 
+  case WM_CREATE:
   case WM_INITDIALOG:
+    LOG_MESSAGE_TO_TRAY(_T("WM_INITDIALOG"));
+
+
+    UDM_TASKBARCREATED = RegisterWindowMessage(_T("TaskbarCreated"));
+    if (UDM_TASKBARCREATED == 0) {
+      LOG_MESSAGE_TO_TRAY(_T("Failed to register 'TaskbarCreated': ") + error::lookup::last_error());
+    }
+    if (!ChangeWindowMessageFilter(UDM_TASKBARCREATED, MSGFLT_ADD)) {
+      LOG_MESSAGE_TO_TRAY(_T("Failed to cchange window filter: ") + error::lookup::last_error());
+    }
+
     addIcon(hwndDlg);
     break;
@@ -601 +669 @@
     break;
   }
-  return FALSE;
+  return DefWindowProc(hwndDlg,uMsg,wParam,lParam);
+  //return FALSE;
 }
 void TrayIcon::addIcon(HWND hWnd) {

helpers/systray_helper/TrayWidget.h

@@ -75 +75 @@
 namespace TrayIcon
 {
-  INT_PTR CALLBACK DialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam);
+  LRESULT CALLBACK DialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam);
   INT_PTR CALLBACK InjectDialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam);
   INT_PTR CALLBACK LogDialogProc(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lParam);

include/NSCHelper.cpp

@@ -257 +257 @@
   return retC;
 }
+
+/**
+* Inject a request command in the core (this will then be sent to the plug-in stack for processing)
+* @param command Command to inject (password should not be included.
+* @param argLen The length of the argument buffer
+* @param **argument The argument buffer
+* @param message The return message buffer
+* @param perf The return performance data buffer
+* @return The return of the command
+*/
+NSCAPI::nagiosReturn NSCModuleHelper::InjectCommand(const TCHAR* command, std::list<std::wstring> argument, std::wstring & message, std::wstring & perf) 
+{
+  if (!fNSAPIInject)
+    throw NSCMHExcpetion(_T("NSCore has not been initiated..."));
+  unsigned int buf_len = getBufferLength();
+
+
+  unsigned int argLen;
+  TCHAR ** aBuffer = arrayBuffer::list2arrayBuffer(argument, argLen);
+  TCHAR *msgBuffer = new TCHAR[buf_len+1];
+  TCHAR *perfBuffer = new TCHAR[buf_len+1];
+  msgBuffer[0] = 0;
+  perfBuffer[0] = 0;
+  NSCAPI::nagiosReturn retC = InjectCommandRAW(command, argLen, aBuffer, msgBuffer, buf_len, perfBuffer, buf_len);
+  switch (retC) {
+    case NSCAPI::returnIgnored:
+      NSC_LOG_MESSAGE_STD(_T("No handler for command '") + command + _T("'."));
+      break;
+    case NSCAPI::returnInvalidBufferLen:
+      NSC_LOG_ERROR(_T("Inject buffer to small, increase the value of: string_length."));
+      break;
+    case NSCAPI::returnOK:
+    case NSCAPI::returnCRIT:
+    case NSCAPI::returnWARN:
+    case NSCAPI::returnUNKNOWN:
+      message = msgBuffer;
+      perf = perfBuffer;
+      break;
+    default:
+      delete [] msgBuffer;
+      delete [] perfBuffer;
+      throw NSCMHExcpetion(_T("Unknown return code when injecting: ") + std::wstring(command));
+  }
+  delete [] msgBuffer;
+  delete [] perfBuffer;
+  return retC;
+}
+
 /**
  * A wrapper around the InjetCommand that is simpler to use.

include/NSCHelper.h

@@ -135 +135 @@
   NSCAPI::nagiosReturn InjectCommandRAW(const TCHAR* command, const unsigned int argLen, TCHAR **argument, TCHAR *returnMessageBuffer, unsigned int returnMessageBufferLen, TCHAR *returnPerfBuffer, unsigned int returnPerfBufferLen);
   NSCAPI::nagiosReturn InjectCommand(const TCHAR* command, const unsigned int argLen, TCHAR **argument, std::wstring & message, std::wstring & perf);
+  NSCAPI::nagiosReturn InjectCommand(const TCHAR* command, std::list<std::wstring> argument, std::wstring & message, std::wstring & perf);
   NSCAPI::nagiosReturn InjectSplitAndCommand(const TCHAR* command, TCHAR* buffer, TCHAR splitChar, std::wstring & message, std::wstring & perf);
   NSCAPI::nagiosReturn InjectSplitAndCommand(const std::wstring command, const std::wstring buffer, TCHAR splitChar, std::wstring & message, std::wstring & perf, bool escape = false);

include/NTService.h

@@ -139 +139 @@
         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());
@@ -146 +145 @@
     ssStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS;
     ssStatus.dwServiceSpecificExitCode = 0;
+    ssStatus.dwControlsAccepted = dwControlsAccepted;
 
     // report the status to the service control manager.
@@ -153 +153 @@
     }
     try {
-      OutputDebugString(_T("Attempting to start service..."));
+      OutputDebugString(std::wstring(_T("Attempting to start service with: ") + strEx::ihextos(dwControlsAccepted)).c_str());
       ServiceStart(dwArgc, lpszArgv);
     } catch (...) {

include/config.h

@@ -161 +161 @@
 #define EVENTLOG_SYNTAX _T("syntax")
 #define EVENTLOG_SYNTAX_DEFAULT _T("")
+#define EVENTLOG_BUFFER _T("buffer_size")
+#define EVENTLOG_BUFFER_DEFAULT 1024*64
 
 #define NSCA_AGENT_SECTION_TITLE _T("NSCA Agent")

include/nsclient_session.hpp

@@ -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);
@@ -658 +656 @@
       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]);
+      //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);
@@ -779 +777 @@
         if (msg.arguments.size() == 4) {
           try {
-            error(__FILEW__, __LINE__, _T("arg1") + msg.arguments[1]);
-            error(__FILEW__, __LINE__, _T("arg2") + msg.arguments[2]);
-            error(__FILEW__, __LINE__, _T("arg3") + msg.arguments[3]);
+            //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[3]==_T("1"), message, perf);
           } catch (...) {

include/sysinfo.h

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

modules/CheckEventLog/CheckEventLog.cpp

@@ -49 +49 @@
     debug_ = NSCModuleHelper::getSettingsInt(EVENTLOG_SECTION_TITLE, EVENTLOG_DEBUG, EVENTLOG_DEBUG_DEFAULT)==1;
     syntax_ = NSCModuleHelper::getSettingsString(EVENTLOG_SECTION_TITLE, EVENTLOG_SYNTAX, EVENTLOG_SYNTAX_DEFAULT);
+    buffer_ = NSCModuleHelper::getSettingsInt(EVENTLOG_SECTION_TITLE, EVENTLOG_BUFFER, EVENTLOG_BUFFER_DEFAULT);
   } catch (NSCModuleHelper::NSCMHExcpetion &e) {
     NSC_LOG_ERROR_STD(_T("Failed to register command: ") + e.msg_);
@@ -387 +388 @@
       else if (p__.first == value) { eventlog_filter filter; filter.obj = p__.second; filter_chain.push_back(filteritem_type(filtermode, filter)); }
 
-
-#define BUFFER_SIZE 1024*64
+struct event_log_buffer {
+  BYTE *bBuffer;
+  DWORD bufferSize_;
+  event_log_buffer(DWORD bufferSize) : bufferSize_(bufferSize) {
+    bBuffer = new BYTE[bufferSize+10];
+  }
+  ~event_log_buffer() {
+    delete [] bBuffer;
+  }
+  EVENTLOGRECORD* getBufferUnsafe() {
+    return reinterpret_cast<EVENTLOGRECORD*>(bBuffer);
+  }
+  DWORD getBufferSize() {
+    return bufferSize_;
+  }
+};
+
 NSCAPI::nagiosReturn CheckEventLog::handleCommand(const strEx::blindstr command, const unsigned int argLen, TCHAR **char_args, std::wstring &message, std::wstring &perf) {
   if (command != _T("CheckEventLog"))
@@ -414 +430 @@
   const int filter_normal = 3;
   const int filter_compat = 3;
+  event_log_buffer buffer(buffer_);
 
   try {
@@ -486 +503 @@
     //DWORD dwThisRecord;
     DWORD dwRead, dwNeeded;
-    EVENTLOGRECORD *pevlr;
-    BYTE bBuffer[BUFFER_SIZE]; 
-
-    pevlr = reinterpret_cast<EVENTLOGRECORD*>(&bBuffer);
+
 
     __time64_t ltime;
@@ -497 +511 @@
 
     while (ReadEventLog(hLog, EVENTLOG_FORWARDS_READ|EVENTLOG_SEQUENTIAL_READ,
-      0, pevlr, BUFFER_SIZE, &dwRead, &dwNeeded))
+      0, buffer.getBufferUnsafe(), buffer.getBufferSize(), &dwRead, &dwNeeded))
     {
-      while (dwRead > 0) 
-      { 
+      EVENTLOGRECORD *pevlr = buffer.getBufferUnsafe(); 
+      while (dwRead > 0) { 
         //bool bMatch = bFilterAll;
         bool bMatch = !bFilterIn;
@@ -590 +604 @@
         }
         dwRead -= pevlr->Length; 
-        pevlr = (EVENTLOGRECORD *) ((LPBYTE) pevlr + pevlr->Length); 
+        pevlr = reinterpret_cast<EVENTLOGRECORD*>((LPBYTE)pevlr + pevlr->Length); 
       } 
-      pevlr = (EVENTLOGRECORD *) &bBuffer; 
-    } 
+    }
+    DWORD err = GetLastError();
+    if (err == ERROR_INSUFFICIENT_BUFFER) {
+      NSC_LOG_ERROR_STD(_T("EvenlogBuffer is too small (set the value of ") + EVENTLOG_BUFFER + _T("): ") + error::lookup::last_error(err));
+      message = std::wstring(_T("EvenlogBuffer is too small (set the value of ")) + EVENTLOG_BUFFER + _T("): ") + error::lookup::last_error(err);
+      return NSCAPI::returnUNKNOWN;
+    } else if (err != ERROR_HANDLE_EOF) {
+      NSC_LOG_ERROR_STD(_T("Failed to read from eventlog: ") + error::lookup::last_error(err));
+      message = _T("Failed to read from eventlog: ") + error::lookup::last_error(err);
+      return NSCAPI::returnUNKNOWN;
+    }
     CloseEventLog(hLog);
     for (uniq_eventlog_map::const_iterator cit = uniq_records.begin(); cit != uniq_records.end(); ++cit) {

modules/CheckEventLog/CheckEventLog.h

@@ -31 +31 @@
   bool debug_;
   std::wstring syntax_;
+  DWORD buffer_;
 
 public:

modules/CheckSystem/PDHCollector.cpp

@@ -29 +29 @@
   std::wstring s = NSCModuleHelper::getSettingsString(C_SYSTEM_SECTION_TITLE, C_SYSTEM_CPU_BUFFER_TIME, C_SYSTEM_CPU_BUFFER_TIME_DEFAULT);
   unsigned int i = strEx::stoui_as_time(s, checkIntervall_*100);
-  cpu.resize(i/(checkIntervall_*100));
+  cpu.resize(i/(checkIntervall_*100)+10);
 }
 

modules/NSClientListener/NSClientListener.cpp

@@ -138 +138 @@
   return false;
 }
-
+void split_to_list(std::list<std::wstring> &list, std::wstring str) {
+  strEx::splitList add = strEx::splitEx(str, _T("&"));
+  list.insert(list.begin(), add.begin(), add.end());
+}
 std::string NSClientListener::parseRequest(std::string str_buffer)  {
   std::wstring buffer = strEx::string_to_wstring(str_buffer);
@@ -168 +171 @@
   NSC_DEBUG_MSG_STD(_T("Data: ") + cmd.second);
 
+  std::list<std::wstring> args;
 
   // prefix various commands
@@ -173 +177 @@
     case REQ_CPULOAD:
       cmd.first = _T("checkCPU");
-      cmd.second += _T("&nsclient");
+      split_to_list(args, cmd.second);
+      args.push_back(_T("nsclient"));
       break;
     case REQ_UPTIME:
       cmd.first = _T("checkUpTime");
-      cmd.second = _T("nsclient");
+      args.push_back(_T("nsclient"));
       break;
     case REQ_USEDDISKSPACE:
       cmd.first = _T("CheckDriveSize");
-      cmd.second += _T("&nsclient");
+      split_to_list(args, cmd.second);
+      args.push_back(_T("nsclient"));
       break;
     case REQ_CLIENTVERSION:
@@ -192 +198 @@
     case REQ_SERVICESTATE:
       cmd.first = _T("checkServiceState");
-      cmd.second += _T("&nsclient");
+      split_to_list(args, cmd.second);
+      args.push_back(_T("nsclient"));
       break;
     case REQ_PROCSTATE:
       cmd.first = _T("checkProcState");
-      cmd.second += _T("&nsclient");
+      split_to_list(args, cmd.second);
+      args.push_back(_T("nsclient"));
       break;
     case REQ_MEMUSE:
       cmd.first = _T("checkMem");
-      cmd.second = _T("nsclient");
+      args.push_back(_T("nsclient"));
       break;
     case REQ_COUNTER:
       cmd.first = _T("checkCounter");
-      cmd.second = _T("Counter=") + cmd.second + _T("&nsclient");
+      args.push_back(_T("Counter=") + cmd.second);
+      args.push_back(_T("nsclient"));
       break;
     case REQ_FILEAGE:
       cmd.first = _T("getFileAge");
-      cmd.second = _T("path=") + cmd.second;
-      break;
+      args.push_back(_T("path=") + cmd.second);
+      break;
+    default:
+      split_to_list(args, cmd.second);
   }
 
   std::wstring message, perf;
-  NSCAPI::nagiosReturn ret = NSCModuleHelper::InjectSplitAndCommand(cmd.first.c_str(), cmd.second.c_str(), '&', message, perf);
+  NSCAPI::nagiosReturn ret = NSCModuleHelper::InjectCommand(cmd.first.c_str(), args, message, perf);
   if (!NSCHelper::isNagiosReturnCode(ret)) {
     if (message.empty())