Changeset 1d53fe0 in nscp

Timestamp:

02/12/09 20:28:56 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

b1ac2fa

Parents:

04f2743

Message:

2009-02-11 MickeM

• Fixed so that performance data is always(?) renderd regardless of if we have bounds or not. This was primarily to fix issues where we have might not "unexpectedly" get performance data (might still be some issues here so let me know).

2009-02-06 MickeM

• Fixed so that arguments ($ARG1$) are parsed properly for alias in CheckExternalScript?

2009-02-05 MickeM

• Fixed so the error message for "to small eventlog buffer" specifies the required size.
• Changed so that event log buffer problems are "ignored in the result" (still logged in the error log).

2009-02-03 MickeM

• Added support for changing the time when using NSCA with the time_delay in NSC.ini time_delay=+4h or time_delay=-1h etc should can now be used when system time not the same as NSCA time.

2009-01-30 MickeM

• Added support for changing name and description of service from the /install command line NSClient++ /install [gui] [start] [service name] [description] NSClient++ /uninstall [gui] [stop] [service name] NSClient++ /start [gui] [service name] NSClient++ /stop [gui] [service name]

2009-01-28 MickeM

• Slightly improved error handling around socket creation
• Fixed some pretty minor issues with the SysTray module (uncreation as well as new boost build).

2009-01-25 MickeM

• Fixed issue with checkVersion (#242)
• Fixed spelling error (#244)
• Fixed crash in CheckFile when a file was locked in exclusive mode (#254) + Improved error handling in all CheckDIsk/CheckFile checks. Should report errors better now.
• Updated the config file a bit: remving "beta" from a bunch of modules no longer in beta. (#270) + Added more filter operatos to all numeric filters so they accept eq:, ne:, gt:, lt: in addition to =, >, <, <>, !, !=, in: (#269)

2009-01-23 MickeM

+ Added better support for numerical hit matching in the eventlog module. You can now use exact and detailed matching.

You can now use the following syntax:
CheckEventLog ... warn=ne:1 crit=eq:0 ...
To generate a warning if the number of hits are != 1 and a critical if the number of hits are = 0.
Other operators avalible are: =, >, <, <>, !, !=, eq:, ne:, gt:, lt:

Files:

• AutoBuild.h (modified) (1 diff)
• Jamroot (added)
• NSClient++.cpp (modified) (5 diffs)
• bjam/boost.jam (added)
• bjam/lua.jam (added)
• bjam/msi.jam (added)
• bjam/openssl.jam (added)
• bjam/win32.jam (added)
• bjam/wix.jam (added)
• bjam/zip.jam (added)
• build.bat (added)
• changelog (modified) (1 diff)
• clean.bat (added)
• include/REGSettings.h (modified) (2 diffs)
• include/ServiceCmd.cpp (modified) (8 diffs)
• include/Socket.h (modified) (2 diffs)
• include/checkHelpers.hpp (modified) (3 diffs)
• include/config.h (modified) (1 diff)
• modules/CheckDisk/Jamfile (added)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (2 diffs)
• modules/CheckEventLog/Jamfile (added)
• modules/CheckExternalScripts/CheckExternalScripts.cpp (modified) (1 diff)
• modules/CheckExternalScripts/Jamfile (added)
• modules/CheckHelpers/Jamfile (added)
• modules/CheckSystem/CheckSystem.cpp (modified) (4 diffs)
• modules/CheckSystem/CheckSystem.h (modified) (1 diff)
• modules/CheckSystem/Jamfile (added)
• modules/CheckTaskSched/Jamfile (added)
• modules/CheckWMI/Jamfile (added)
• modules/DebugLogMetrics/Jamfile (added)
• modules/FileLogger/Jamfile (added)
• modules/LUAScript/Jamfile (added)
• modules/NRPEClient/Jamfile (added)
• modules/NRPEListener/Jamfile (added)
• modules/NRPEListener/NRPEListener.cpp (modified) (3 diffs)
• modules/NSCAAgent/Jamfile (added)
• modules/NSCAAgent/NSCAThread.cpp (modified) (2 diffs)
• modules/NSCAAgent/NSCAThread.h (modified) (3 diffs)
• modules/NSClientListener/Jamfile (added)
• modules/NSClientListener/NSClientListener.cpp (modified) (2 diffs)
• modules/RemoteConfiguration/Jamfile (added)
• modules/SysTray/Jamfile (added)
• modules/SysTray/SysTray.cpp (modified) (1 diff)
• modules/SysTray/TrayIcon.cpp (modified) (2 diffs)
• release-build.bat (added)
• upload.bat (added)

AutoBuild.h

@@ -3 +3 @@
 // change the FALSE to TRUE for autoincrement of build number
 #define INCREMENT_VERSION TRUE
-#define FILEVER        0,3,6,249
-#define PRODUCTVER     0,3,6,249
-#define STRFILEVER     _T("0.3.6.249")
-#define STRPRODUCTVER  _T("0.3.6.249")
-#define STRPRODUCTDATE  _T("2009-01-25")
+#define FILEVER        0,3,6,330
+#define PRODUCTVER     0,3,6,330
+#define STRFILEVER     _T("0.3.6.330")
+#define STRPRODUCTVER  _T("0.3.6.330")
+#define STRPRODUCTDATE  _T("2009-02-11")
 #endif // AUTOBUILD_H

NSClient++.cpp

@@ -180 +180 @@
   if ( (argc > 1) && ((*argv[1] == '-') || (*argv[1] == '/')) ) {
     if ( _wcsicmp( _T("install"), argv[1]+1 ) == 0 ) {
-      bool bGui = (argc > 2) && (_wcsicmp( _T("gui"), argv[2] )) || (argc > 3) && (_wcsicmp( _T("gui"), argv[3] ));
-      bool bStart = (argc > 2) && (_wcsicmp( _T("start"), argv[2] )) || (argc > 3) && (_wcsicmp( _T("start"), argv[3] ));
+      bool bGui = false;
+      bool bStart = false;
+      std::wstring service_name, service_description;
+      for (int i=2;i<argc;i++) {
+        if (_wcsicmp( _T("gui"), argv[i]) == 0) {
+          bGui = true;
+        } else if (_wcsicmp( _T("start"), argv[i]) == 0) {
+          bStart = true;
+        } else {
+          if (service_name.empty())
+            service_name = argv[i];
+          else {
+            if (!service_description.empty())
+              service_description += _T(" ");
+            service_description += argv[i];
+          }
+        }
+      }
+      if (service_name.empty())
+        service_name = SZSERVICENAME;
+      if (service_description.empty())
+        service_description = SZSERVICEDISPLAYNAME;
       g_bConsoleLog = true;
       try {
-        serviceControll::Install(SZSERVICENAME, SZSERVICEDISPLAYNAME, SZDEPENDENCIES);
+        serviceControll::Install(service_name.c_str(), service_description.c_str(), SZDEPENDENCIES);
         if (bStart)
-          serviceControll::Start(SZSERVICENAME);
+          serviceControll::Start(service_name);
       } catch (const serviceControll::SCException& e) {
         if (bGui)
@@ -194 +214 @@
       }
       try {
-        serviceControll::SetDescription(SZSERVICENAME, SZSERVICEDESCRIPTION);
+        serviceControll::SetDescription(service_name, service_description);
       } catch (const serviceControll::SCException& e) {
         if (bGui)
@@ -203 +223 @@
       return 0;
     } else if ( _wcsicmp( _T("uninstall"), argv[1]+1 ) == 0 ) {
-      bool bGui = (argc > 2) && (_wcsicmp( _T("gui"), argv[2] ));
+      bool bGui = false;
+      bool bStop = false;
+      std::wstring service_name;
+      for (int i=2;i<argc;i++) {
+        if (_wcsicmp( _T("gui"), argv[i]) == 0) {
+          bGui = true;
+        } else if (_wcsicmp( _T("stop"), argv[i]) == 0) {
+          bStop = true;
+        } else {
+          service_name = argv[i];
+        }
+      }
+      if (service_name.empty())
+        service_name = SZSERVICENAME;
       g_bConsoleLog = true;
       try {
-        serviceControll::Uninstall(SZSERVICENAME);
+        if (bStop)
+          serviceControll::Stop(service_name);
+        serviceControll::Uninstall(service_name);
       } catch (const serviceControll::SCException& e) {
         if (bGui)
@@ -234 +269 @@
     } else if ( _wcsicmp( _T("start"), argv[1]+1 ) == 0 ) {
       g_bConsoleLog = true;
+      bool bGui = false;
+      std::wstring service_name;
+      for (int i=2;i<argc;i++) {
+        if (_wcsicmp( _T("gui"), argv[i]) == 0) {
+          bGui = true;
+        } else {
+          service_name = argv[i];
+        }
+      }
+      if (service_name.empty())
+        service_name = SZSERVICENAME;
       try {
-        serviceControll::Start(SZSERVICENAME);
+        serviceControll::Start(service_name.c_str());
       } catch (const serviceControll::SCException& e) {
+        if (bGui)
+          display(_T("Service failed to start"), e.error_);
         LOG_MESSAGE_STD(_T("Service failed to start: ") + e.error_);
         return -1;
@@ -242 +290 @@
     } else if ( _wcsicmp( _T("stop"), argv[1]+1 ) == 0 ) {
       g_bConsoleLog = true;
+      bool bGui = false;
+      std::wstring service_name;
+      for (int i=2;i<argc;i++) {
+        if (_wcsicmp( _T("gui"), argv[i]) == 0) {
+          bGui = true;
+        } else {
+          service_name = argv[i];
+        }
+      }
+      if (service_name.empty())
+        service_name = SZSERVICENAME;
       try {
-        serviceControll::Stop(SZSERVICENAME);
+        serviceControll::Stop(service_name.c_str());
       } catch (const serviceControll::SCException& e) {
+        if (bGui)
+          display(_T("Service failed to stop"), e.error_);
         LOG_MESSAGE_STD(_T("Service failed to stop: ") + e.error_);
         return -1;

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")
+
+2009-02-11 MickeM 
+ * Fixed so that performance data is always(?) renderd regardless of if we have bounds or not.
+   This was primarily to fix issues where we have might not "unexpectedly" get performance data (might still be some issues here so let me know).
+
+2009-02-06 MickeM 
+ * Fixed so that arguments ($ARG1$) are parsed properly for alias in CheckExternalScript
+
+2009-02-05 MickeM 
+ * Fixed so the error message for "to small eventlog buffer" specifies the required size.
+ * Changed so that event log buffer problems are "ignored in the result" (still logged in the error log).
+
+2009-02-03 MickeM 
+ * Added support for changing the time when using NSCA with the time_delay in NSC.ini
+   time_delay=+4h or time_delay=-1h etc should can now be used when system time not the same as NSCA time.
+
+2009-01-30 MickeM 
+ * Added support for changing name and description of service from the /install command line
+   NSClient++ /install [gui] [start] [service name] [description]
+   NSClient++ /uninstall [gui] [stop] [service name]
+   NSClient++ /start [gui] [service name]
+   NSClient++ /stop [gui] [service name]
+
+2009-01-28 MickeM 
+ * Slightly improved error handling around socket creation
+ * Fixed some pretty minor issues with the SysTray module (uncreation as well as new boost build).
 
 2009-01-25 MickeM 

include/REGSettings.h

@@ -148 +148 @@
     DWORD type;
     DWORD cbData = sizeof(DWORD);
-    BYTE *bData = new BYTE[cbData+1];
-    bRet = RegQueryValueEx(hTemp, lpszKey, NULL, &type, bData, &cbData);
+    DWORD buffer;
+    //BYTE *bData = new BYTE[cbData+1];
+    bRet = RegQueryValueEx(hTemp, lpszKey, NULL, &type, reinterpret_cast<LPBYTE>(&buffer), &cbData );
     if (type != REG_DWORD) {
       bRet = -1;
@@ -155 +156 @@
     RegCloseKey(hTemp);
     if (bRet == ERROR_SUCCESS) {
-      ret = static_cast<DWORD>(*bData);
-    }
-    delete [] bData;
+      ret = buffer;
+    }
+    //delete [] bData;
     return ret;
   }

include/ServiceCmd.cpp

@@ -21 +21 @@
 #include <iostream>
 #include <msvc_wrappers.h>
+#include <error.hpp>
 
 namespace serviceControll {
@@ -45 +46 @@
     schSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
     if (!schSCManager)
-      throw SCException(_T("OpenSCManager failed."));
+      throw SCException(_T("OpenSCManager failed:") + error::lookup::last_error());
     schService = CreateService(
       schSCManager,               // SCManager database
@@ -67 +68 @@
         throw SCException(_T("Service already installed!"));
       }
-      throw SCException(_T("Unable to install service."), err);
+      throw SCException(_T("Unable to install service.") + error::lookup::last_error(err));
     }
     std::wcout << _T("Service ") << szName << _T(" installed...") << std::endl;;
@@ -84 +85 @@
     schSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
     if (!schSCManager)
-      throw SCException(_T("OpenSCManager failed."));
+      throw SCException(_T("OpenSCManager failed: ") + error::lookup::last_error());
     schService = OpenService(schSCManager, szName, SERVICE_ALL_ACCESS);
     if (!schService) {
       DWORD err = GetLastError();
       CloseServiceHandle(schSCManager);
-      throw SCException(_T("Unable to open service."), err);
+      throw SCException(_T("Unable to open service: ") + error::lookup::last_error(err));
     }
     BOOL result = ChangeServiceConfig(schService, dwServiceType, SERVICE_NO_CHANGE, SERVICE_NO_CHANGE , NULL, NULL, NULL, 
@@ -118 +119 @@
       DWORD err = GetLastError();
       CloseServiceHandle(schSCManager);
-      throw SCException(_T("Unable to open service."), err);
+      throw SCException(_T("Unable to open service: ") + error::lookup::last_error(err));
     }
 
@@ -150 +151 @@
     schSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS );
     if (!schSCManager) 
-      throw SCException(_T("OpenSCManager failed."));
+      throw SCException(_T("OpenSCManager failed: ") + error::lookup::last_error());
     schService = OpenService(schSCManager, name.c_str(), SERVICE_ALL_ACCESS);
     if (schService) {
@@ -172 +173 @@
       CloseServiceHandle(schService);
     } else {
-      CloseServiceHandle(schSCManager);
-      throw SCException(_T("OpenService failed."));
+      std::wstring err = _T("OpenService failed: ") + error::lookup::last_error();
+      CloseServiceHandle(schSCManager);
+      throw SCException(err);
     }
     CloseServiceHandle(schSCManager);
@@ -187 +189 @@
     schSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS );
     if (!schSCManager) 
-      throw SCException(_T("OpenSCManager failed."));
+      throw SCException(_T("OpenSCManager failed: ") + error::lookup::last_error());
     schService = OpenService(schSCManager, name.c_str(), SERVICE_ALL_ACCESS);
     if (schService) {

include/Socket.h

@@ -507 +507 @@
         bindAddres_ = INADDR_ANY;
       listenQue_ = queLength;
-      threadManager_.createThread(this);
+      try {
+        threadManager_.createThread(this);
+      } catch (ThreadException e) {
+        throw SocketException(_T("Could not start thread (got exception in thread): ") + e.e_);
+      }
     }
     virtual void StopListener() {
@@ -518 +522 @@
       } catch (ThreadException e) {
         tBase::close();
-        throw SocketException(_T("Could not terminate thread (got exception in thread)."));
+        throw SocketException(_T("Could not terminate thread (got exception in thread): ") + e.e_);
       }
       tBase::close();

include/checkHelpers.hpp

@@ -137 +137 @@
       std::wstring tstr;
       if (crit.check(value, getAlias(), tstr, critical)) {
-        std::wcout << _T("crit") << std::endl;
+        //std::wcout << _T("crit") << std::endl;
         NSCHelper::escalteReturnCodeToCRIT(returnCode);
       } else if (warn.check(value, getAlias(), tstr, warning)) {
-        std::wcout << _T("warn") << std::endl;
+        //std::wcout << _T("warn") << std::endl;
         NSCHelper::escalteReturnCodeToWARN(returnCode);
       }else if (show == showLong) {
-        std::wcout << _T("long") << std::endl;
+        //std::wcout << _T("long") << std::endl;
         tstr = getAlias() + _T(": ") + TContents::toStringLong(value);
       }else if (show == showShort) {
-        std::wcout << _T("short") << std::endl;
+        //std::wcout << _T("short") << std::endl;
         tstr = getAlias() + _T(": ") + TContents::toStringShort(value);
       }
-      std::wcout << _T("result: ") << tstr << _T("--") << std::endl;
       if (perfData)
         perf += gatherPerfData(value);
@@ -682 +681 @@
         return true;
       } else {
+        NSC_DEBUG_MSG_STD(_T("Missing bounds for check: ") + lable);
         //std::cout << "No bounds specified..." << std::endl;
       }
@@ -757 +757 @@
       } else {
         NSC_DEBUG_MSG_STD(_T("Missing bounds for maxmin-bounds check: ") + alias);
+        return min.gatherPerfData(alias, value, 0, 0);
       }
       return _T("");

include/config.h

@@ -184 +184 @@
 #define NSCA_CACHE_HOST _T("cache_hostname")
 #define NSCA_CACHE_HOST_DEFAULT 0
+#define NSCA_TIME_DELTA _T("time_delay")
+#define NSCA_TIME_DELTA_DEFAULT _T("0")
 
 #define C_SYSTEM_SVC_ALL_0 _T("check_all_services[SERVICE_BOOT_START]")

modules/CheckEventLog/CheckEventLog.cpp

@@ -622 +622 @@
     //GetOldestEventLogRecord(hLog, &dwThisRecord);
 
-    while (ReadEventLog(hLog, EVENTLOG_FORWARDS_READ|EVENTLOG_SEQUENTIAL_READ,
-      0, buffer.getBufferUnsafe(), buffer.getBufferSize(), &dwRead, &dwNeeded))
-    {
+    while (true) {
+      BOOL bStatus = ReadEventLog(hLog, EVENTLOG_FORWARDS_READ|EVENTLOG_SEQUENTIAL_READ,
+        0, buffer.getBufferUnsafe(), buffer.getBufferSize(), &dwRead, &dwNeeded);
+      if (bStatus == FALSE) {
+        DWORD err = GetLastError();
+        if (err == ERROR_INSUFFICIENT_BUFFER) {
+          NSC_LOG_ERROR_STD(_T("EvenlogBuffer is too small change the value of ") + EVENTLOG_BUFFER + _T("=") + strEx::itos(dwNeeded+1) + _T(" under [EventLog] in nsc.ini : ") + error::lookup::last_error(err));
+        } else if (err == ERROR_HANDLE_EOF) {
+          break;
+        } else {
+          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);
+          CloseEventLog(hLog);
+          return NSCAPI::returnUNKNOWN;
+        }
+      }
       EVENTLOGRECORD *pevlr = buffer.getBufferUnsafe(); 
       while (dwRead > 0) { 
@@ -719 +732 @@
       } 
     }
-    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/CheckExternalScripts/CheckExternalScripts.cpp

@@ -135 +135 @@
   }
   if (isAlias) {
-    return NSCModuleHelper::InjectSplitAndCommand(cd.command, cd.arguments, ' ', message, perf, true);
+    return NSCModuleHelper::InjectSplitAndCommand(cd.command, args, ' ', message, perf, true);
   } else {
     int result = process::executeProcess(root_, cd.command + _T(" ") + args, message, perf, timeout);

modules/CheckSystem/CheckSystem.cpp

@@ -73 +73 @@
     NSCModuleHelper::registerCommand(_T("checkMem"), _T("Check free/used memory on the system."));
     NSCModuleHelper::registerCommand(_T("checkCounter"), _T("Check a PDH counter."));
+    NSCModuleHelper::registerCommand(_T("listCounterInstances"), _T("List all instances for a counter."));
+    
   } catch (NSCModuleHelper::NSCMHExcpetion &e) {
     NSC_LOG_ERROR_STD(_T("Failed to register command: ") + e.msg_);
@@ -330 +332 @@
   } else if (command == _T("checkCounter")) {
     return checkCounter(argLen, char_args, msg, perf);
+  } else if (command == _T("listCounterInstances")) {
+    return listCounterInstances(argLen, char_args, msg, perf);
   }
   return NSCAPI::returnIgnored;
@@ -1065 +1069 @@
         msg += strEx::itos(static_cast<float>(value));
       } else {
+        std::wcout << _T("perf data: ") << bPerfData << std::endl;
         counter.perfData = bPerfData;
         counter.setDefault(tmpObject);
@@ -1088 +1093 @@
   return returnCode;
 }
+
+
+
+/**
+ * List all instances for a given counter.
+ *
+ * @param command Command to execute
+ * @param argLen The length of the argument buffer
+ * @param **char_args The argument buffer
+ * @param &msg String to put message in
+ * @param &perf String to put performance data in 
+ * @return The status of the command
+ *
+ * @todo add parsing support for NRPE
+ */
+NSCAPI::nagiosReturn CheckSystem::listCounterInstances(const unsigned int argLen, TCHAR **char_args, std::wstring &msg, std::wstring &perf)
+{
+  typedef checkHolders::CheckContainer<checkHolders::MaxMinBoundsDouble> CounterContainer;
+
+  std::list<std::wstring> stl_args = arrayBuffer::arrayBuffer2list(argLen, char_args);
+  if (stl_args.empty()) {
+    msg = _T("ERROR: Missing argument exception.");
+    return NSCAPI::returnUNKNOWN;
+  }
+
+  std::wstring counter = arrayBuffer::arrayBuffer2string(char_args, argLen, _T(" "));
+  try {
+    PDH::Enumerations::pdh_object_details obj = PDH::Enumerations::EnumObjectInstances(counter);
+    for (PDH::Enumerations::pdh_object_details::list::const_iterator it = obj.instances.begin(); it!=obj.instances.end();++it) {
+      if (!msg.empty())
+        msg += _T(", ");
+      msg += (*it);
+    }
+  } catch (const PDH::PDHException e) {
+    msg = _T("ERROR: Failed to enumerate counter instances: " + e.getError());
+    return NSCAPI::returnUNKNOWN;
+  } catch (...) {
+    msg = _T("ERROR: Failed to enumerate counter instances: <UNKNOWN EXCEPTION>");
+    return NSCAPI::returnUNKNOWN;
+  }
+  return NSCAPI::returnOK;
+}
+
+
 NSC_WRAPPERS_MAIN_DEF(gCheckSystem);
 NSC_WRAPPERS_IGNORE_MSG_DEF();

modules/CheckSystem/CheckSystem.h

@@ -80 +80 @@
   NSCAPI::nagiosReturn checkProcState(const unsigned int argLen, TCHAR **char_args, std::wstring &msg, std::wstring &perf);
   NSCAPI::nagiosReturn checkCounter(const unsigned int argLen, TCHAR **char_args, std::wstring &msg, std::wstring &perf);
+  NSCAPI::nagiosReturn listCounterInstances(const unsigned int argLen, TCHAR **char_args, std::wstring &msg, std::wstring &perf);
+
 
 };

modules/NRPEListener/NRPEListener.cpp

@@ -89 +89 @@
   if (buffer_length_ != 1024)
     NSC_DEBUG_MSG_STD(_T("Non-standard buffer length (hope you have recompiled check_nrpe changing #define MAX_PACKETBUFFER_LENGTH = ") + strEx::itos(buffer_length_));
+  NSC_DEBUG_MSG_STD(_T("Loading all commands (from NRPE)"));
   std::list<std::wstring> commands = NSCModuleHelper::getSettingsSection(NRPE_HANDLER_SECTION_TITLE);
   std::list<std::wstring>::const_iterator it;
@@ -118 +119 @@
   allowedHosts.setAllowedHosts(strEx::splitEx(getAllowedHosts(), _T(",")), getCacheAllowedHosts());
   try {
+    NSC_DEBUG_MSG_STD(_T("Starting NRPE socket..."));
     unsigned short port = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_PORT, NRPE_SETTINGS_PORT_DEFAULT);
     std::wstring host = NSCModuleHelper::getSettingsString(NRPE_SECTION_TITLE, NRPE_SETTINGS_BINDADDR, NRPE_SETTINGS_BINDADDR_DEFAULT);
@@ -140 +142 @@
     return false;
 #endif
+  } catch (...) {
+    NSC_LOG_ERROR_STD(_T("Exception caught: <UNKNOWN EXCEPTION>"));
+    return false;
   }
   root_ = NSCModuleHelper::getBasePath();

modules/NSCAAgent/NSCAThread.cpp

@@ -24 +24 @@
 
 NSCAThread::NSCAThread() : hStopEvent_(NULL) {
+  std::wstring tmpstr = NSCModuleHelper::getSettingsString(NSCA_AGENT_SECTION_TITLE, NSCA_TIME_DELTA, NSCA_TIME_DELTA_DEFAULT);
+  if (tmpstr[0] == '-' && tmpstr.size() > 2)
+    timeDelta_ = - strEx::stoui_as_time(tmpstr.substr(1));
+  if (tmpstr[0] == '+' && tmpstr.size() > 2)
+    timeDelta_ = strEx::stoui_as_time(tmpstr.substr(1));
+  else
+    timeDelta_ = strEx::stoui_as_time(tmpstr);
+  NSC_DEBUG_MSG_STD(_T("Time difference for NSCA server is: ") + strEx::itos(timeDelta_));
   checkIntervall_ = NSCModuleHelper::getSettingsInt(NSCA_AGENT_SECTION_TITLE, NSCA_INTERVAL, NSCA_INTERVAL_DEFAULT);
   hostname_ = NSCModuleHelper::getSettingsString(NSCA_AGENT_SECTION_TITLE, NSCA_HOSTNAME, NSCA_HOSTNAME_DEFAULT);
@@ -192 +200 @@
       for (std::list<Command::Result>::const_iterator cit = results.begin(); cit != results.end(); ++cit) {
         try {
-          socket.send((*cit).getBuffer(crypt_inst));
+          socket.send((*cit).getBuffer(crypt_inst, timeDelta_));
         } catch (NSCAPacket::NSCAException &e) {
           NSC_LOG_ERROR_STD(_T("Failed to make command: ") + e.getMessage() );

modules/NSCAAgent/NSCAThread.h

@@ -160 +160 @@
     }
 
-    simpleSocket::DataBuffer getBuffer(nsca_encrypt &crypt_inst) const {
+    simpleSocket::DataBuffer getBuffer(nsca_encrypt &crypt_inst, __time32_t time_delta) const {
       std::string s = strEx::wstring_to_string(service);
       std::string r = strEx::wstring_to_string(result);
@@ -169 +169 @@
       NSCAPacket::data_packet *data = reinterpret_cast<NSCAPacket::data_packet*>(buffer);
       data->packet_version=static_cast<NSCAPacket::int16_t>(htons(NSCA_PACKET_VERSION_3));
-      data->timestamp=static_cast<NSCAPacket::u_int32_t>(htonl(time));
+      data->timestamp=static_cast<NSCAPacket::u_int32_t>(htonl(time+time_delta));
       data->return_code = ntohs(code);
       data->crc32_value=static_cast<NSCAPacket::u_int32_t>(0L);
@@ -230 +230 @@
   std::string password_;
   int encryption_method_;
+  long timeDelta_;
 
 public:

modules/NSClientListener/NSClientListener.cpp

@@ -36 +36 @@
 #define REQ_MEMUSE      7 // Works fine!
 #define REQ_COUNTER     8 // Works fine!
-#define REQ_FILEAGE     9 // ... in the works ...
-//#define REQ_INSTANCES 10  // ! - not implemented Don't know how to use
+#define REQ_FILEAGE     9 // Works fine! (i hope)
+#define REQ_INSTANCES   10  // Works fine! (i hope)
 
 BOOL APIENTRY DllMain( HANDLE hModule, DWORD  ul_reason_for_call, LPVOID lpReserved)
@@ -219 +219 @@
       args.push_back(_T("path=") + cmd.second);
       break;
+    case REQ_INSTANCES:
+      cmd.first = _T("listCounterInstances");
+      args.push_back(cmd.second);
+      break;
+
+      
     default:
       split_to_list(args, cmd.second);

modules/SysTray/SysTray.cpp

@@ -66 +66 @@
 }
 bool SysTray::unloadModule() {
-  if (systemInfo::isBelowXP(systemInfo::getOSVersion())) {
-    hide();
+  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 un-load..."));
+    return true;
   }
+  hide();
   return true;
 }

modules/SysTray/TrayIcon.cpp

@@ -122 +122 @@
 void IconWidget_::createDialog(void) {
   hDlgWnd = ::CreateDialog(NSCModuleWrapper::getModule(),MAKEINTRESOURCE(IDD_NSTRAYDLG),NULL,TrayIcon::DialogProc);
+  if (hDlgWnd == NULL || !IsWindow(hDlgWnd)) {
+    NSC_LOG_ERROR_STD(_T("Failed to create windows: ") + error::lookup::last_error());
+  }
 
   UINT UDM_TASKBARCREATED = RegisterWindowMessage(_T("TaskbarCreated"));
@@ -136 +139 @@
   {
     if (Msg.message == WM_MY_CLOSE) {
+      TrayIcon::removeIcon(Msg.hwnd);
       ::DestroyWindow(hDlgWnd);
 //    } else if (Msg.message == WM_QUERYENDSESSION) {