Changeset 99bb030 in nscp

Timestamp:

03/20/06 16:50:33 (7 years ago)

Author:

Michael Medin <michael@…>

Children:

8b89aba

Parents:

c3579b8

Message:

* empty log message *

Location:

trunk

Files:

• NSC.dist (modified) (2 diffs)
• NSClient++.cpp (modified) (6 diffs)
• NSClient++.vcproj (modified) (4 diffs)
• changelog (modified) (1 diff)
• include/SSLSocket.cpp (modified) (2 diffs)
• include/SSLSocket.h (modified) (1 diff)
• include/Settings.h (modified) (6 diffs)
• include/Socket.h (modified) (7 diffs)
• include/config.h (modified) (5 diffs)
• include/strEx.h (modified) (1 diff)
• modules/CheckDisk/CheckDisk.cpp (modified) (10 diffs)
• modules/CheckDisk/CheckDisk.h (modified) (1 diff)
• modules/CheckEventLog/CheckEventLog.cpp (modified) (1 diff)
• modules/CheckEventLog/CheckEventLog.h (modified) (1 diff)
• modules/CheckSystem/CheckSystem.cpp (modified) (3 diffs)
• modules/CheckSystem/CheckSystem.def (modified) (1 diff)
• modules/CheckSystem/CheckSystem.h (modified) (4 diffs)
• modules/CheckSystem/CheckSystem.vcproj (modified) (1 diff)
• modules/CheckWMI/CheckWMI.cpp (modified) (1 diff)
• modules/NRPEListener/NRPEListener.cpp (modified) (2 diffs)
• modules/NSClientListener/NSClientListener.cpp (modified) (2 diffs)
• modules/SysTray/SysTray.cpp (modified) (1 diff)

trunk/NSC.dist

@@ -51 +51 @@
 
 [NSClient]
+;# ALLOWED HOST ADDRESSES
+;  This is a comma-delimited list of IP address of hosts that are allowed to talk to NSClient deamon.
+;  If you leave this blank the global version will be used instead.
+;allowed_hosts=
+;
 ;# NSCLIENT PORT NUMBER
 ;  This is the port the NSClientListener.dll will listen to.
 ;port=12489
+;
+;# BIND TO ADDRESS
+;  Allows you to bind server to a specific local address. This has to be a dotted ip adress not a hostname.
+;  Leaving this blank will bind to all avalible IP adresses.
+;bind_to_address=
 
 
@@ -87 +97 @@
 ;  This option controls if SSL should be used on the socket.
 ;use_ssl=1
+;
+;# BIND TO ADDRESS
+;  Allows you to bind server to a specific local address. This has to be a dotted ip adress not a hostname.
+;  Leaving this blank will bind to all avalible IP adresses.
+; bind_to_address=
+;
+;# ALLOWED HOST ADDRESSES
+;  This is a comma-delimited list of IP address of hosts that are allowed to talk to NRPE deamon.
+;  If you leave this blank the global version will be used instead.
+;allowed_hosts=
+
 
 [NRPE Handlers]

trunk/NSClient++.cpp

@@ -20 +20 @@
 #include <Socket.h>
 #include <b64/b64.h>
-#include <PDHCounter.h>
-#include <PDHCollectors.h>
 
 
@@ -89 +87 @@
       g_bConsoleLog = true;
       LOG_MESSAGE(SZAPPNAME " Version: " SZVERSION);
-
-
-    } else if ( _stricmp( "listpdh", argv[1]+1 ) == 0 ) {
-      PDH::Enumerations::Objects lst = PDH::Enumerations::EnumObjects();
-      for (PDH::Enumerations::Objects::iterator it = lst.begin();it!=lst.end();++it) {
-        if ((*it).instances.size() > 0) {
-          for (PDH::Enumerations::Instances::const_iterator it2 = (*it).instances.begin();it2!=(*it).instances.end();++it2) {
-            for (PDH::Enumerations::Counters::const_iterator it3 = (*it).counters.begin();it3!=(*it).counters.end();++it3) {
-              std::cout << "\\" << (*it).name << "(" << (*it2).name << ")\\" << (*it3).name << std::endl;;
-            }
-          }
-        } else {
-          for (PDH::Enumerations::Counters::const_iterator it2 = (*it).counters.begin();it2!=(*it).counters.end();++it2) {
-            std::cout << "\\" << (*it).name << "\\" << (*it2).name << std::endl;;
-          }
-        }
-      }
-    } else if ( _stricmp( "debugpdh", argv[1]+1 ) == 0 ) {
-      PDH::Enumerations::Objects lst = PDH::Enumerations::EnumObjects();
-      for (PDH::Enumerations::Objects::iterator it = lst.begin();it!=lst.end();++it) {
-        if ((*it).instances.size() > 0) {
-          for (PDH::Enumerations::Instances::const_iterator it2 = (*it).instances.begin();it2!=(*it).instances.end();++it2) {
-            for (PDH::Enumerations::Counters::const_iterator it3 = (*it).counters.begin();it3!=(*it).counters.end();++it3) {
-              std::string counter = "\\" + (*it).name + "(" + (*it2).name + ")\\" + (*it3).name;
-              std::cout << "testing: " << counter << ": ";
-              std::string error;
-              if (PDH::Enumerations::validate(counter, error)) {
-                std::cout << " found ";
-              } else {
-                std::cout << " *NOT* found (" << error << ") " << std::endl;
-                break;
-              }
-              bool bOpend = false;
-              try {
-                PDH::PDHQuery pdh;
-                PDHCollectors::StaticPDHCounterListener<double, PDH_FMT_DOUBLE> cDouble;
-                pdh.addCounter(counter, &cDouble);
-                pdh.open();
-                pdh.gatherData();
-                pdh.close();
-                bOpend = true;
-              } catch (const PDH::PDHException e) {
-                std::cout << " could *not* be open (" << e.getError() << ") " << std::endl;
-                break;
-              }
-              std::cout << " open ";
-              std::cout << std::endl;
-            }
-          }
-        } else {
-          for (PDH::Enumerations::Counters::const_iterator it2 = (*it).counters.begin();it2!=(*it).counters.end();++it2) {
-            std::string counter = "\\" + (*it).name + "\\" + (*it2).name;
-            std::cout << "testing: " << counter << ": ";
-            std::string error;
-            if (PDH::Enumerations::validate(counter, error)) {
-              std::cout << " found ";
-            } else {
-              std::cout << " *NOT* found (" << error << ") " << std::endl;
-              break;
-            }
-            bool bOpend = false;
-            try {
-              PDH::PDHQuery pdh;
-              PDHCollectors::StaticPDHCounterListener<double, PDH_FMT_DOUBLE> cDouble;
-              pdh.addCounter(counter, &cDouble);
-              pdh.open();
-              pdh.gatherData();
-              pdh.close();
-              bOpend = true;
-            } catch (const PDH::PDHException e) {
-              std::cout << " could *not* be open (" << e.getError() << ") " << std::endl;
-              break;
-            }
-            std::cout << " open ";
-            std::cout << std::endl;;
-          }
-        }
-      }
     } else if ( _stricmp( "test", argv[1]+1 ) == 0 ) {
 #ifdef _DEBUG
@@ -176 +96 @@
       */
 #endif
-
       g_bConsoleLog = true;
       mainClient.InitiateService();
@@ -469 +388 @@
 
 bool NSClientT::logDebug() {
-  if (g_bConsoleLog)
-    return true;
   typedef enum status {unknown, debug, nodebug };
   static status d = unknown;
@@ -491 +408 @@
  */
 void NSClientT::reportMessage(int msgType, const char* file, const int line, std::string message) {
-  ReadLock readLock(&m_mutexRW, true, 5000);
-  if (!readLock.IsLocked()) {
-    std::cout << "Message was lost as the core was locked..." << std::endl;
+  if ((msgType == NSCAPI::debug)&&(!logDebug())) {
     return;
   }
-  MutexLock lock(messageMutex);
-  if (!lock.hasMutex()) {
-    std::cout << "Message was lost as the core was locked..." << std::endl;
-    std::cout << message << std::endl;
-    return;
-  }
-  if (g_bConsoleLog) {
-    std::string k = "?";
-    switch (msgType) {
+  {
+    ReadLock readLock(&m_mutexRW, true, 5000);
+    if (!readLock.IsLocked()) {
+      std::cout << "Message was lost as the core was locked..." << std::endl;
+      return;
+    }
+    MutexLock lock(messageMutex);
+    if (!lock.hasMutex()) {
+      std::cout << "Message was lost as the core was locked..." << std::endl;
+      std::cout << message << std::endl;
+      return;
+    }
+    if (g_bConsoleLog) {
+      std::string k = "?";
+      switch (msgType) {
       case NSCAPI::critical:
         k ="c";
@@ -520 +441 @@
         k ="d";
         break;
-    }
-    std::cout << k << " " << file << "(" << line << ") " << message << std::endl;
-  }
-  if ((msgType == NSCAPI::debug)&&(!logDebug())) {
-    return;
-  }
-  for (pluginList::size_type i = 0; i< messageHandlers_.size(); i++) {
-    try {
-      messageHandlers_[i]->handleMessage(msgType, file, line, message.c_str());
-    } catch(const NSPluginException& e) {
-      // Here we are pretty much fucked! (as logging this might cause a loop :)
-      std::cout << "Caught: " << e.error_ << " when trying to log a message..." << std::endl;
-      std::cout << "This is *really really* bad, now the world is about to end..." << std::endl;
+      }
+      std::cout << k << " " << file << "(" << line << ") " << message << std::endl;
+    }
+    for (pluginList::size_type i = 0; i< messageHandlers_.size(); i++) {
+      try {
+        messageHandlers_[i]->handleMessage(msgType, file, line, message.c_str());
+      } catch(const NSPluginException& e) {
+        // Here we are pretty much fucked! (as logging this might cause a loop :)
+        std::cout << "Caught: " << e.error_ << " when trying to log a message..." << std::endl;
+        std::cout << "This is *really really* bad, now the world is about to end..." << std::endl;
+      }
     }
   }

trunk/NSClient++.vcproj

@@ -112 +112 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib Pdh.lib"
+        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib"
         OutputFile=".\Debug/NSClient++.exe"
         LinkIncremental="1"
@@ -178 +178 @@
 echo Removing old archive
 cmd /c &quot;del $(InputDir)\Dist\$(InputName).zip&quot;
-echo Copying documenation
-mkdir $(TargetDir)\docs
-xcopy /s /e /c /q /y $(InputDir)\docs $(TargetDir)\docs
 echo Making archive
 7z.exe a -r -tzip -bd $(InputDir)\Dist\$(InputName).zip $(InputDir)\Dist\*
@@ -187 +184 @@
       <Tool
         Name="VCLinkerTool"
-        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib Pdh.lib"
+        AdditionalDependencies="kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ws2_32.lib"
         OutputFile=".\Dist/NSClient++.exe"
         LinkIncremental="1"
@@ -336 +333 @@
       </File>
       <File
-        RelativePath=".\Settings.h">
+        RelativePath=".\include\Settings.h">
       </File>
       <File

trunk/changelog

@@ -1 +1 @@
 TODO: 
  * Process times and similar ?
- * Add bind_to_address in the socket
  * Fix configuration GUI (low priority)
- * Fix installer (low priority)
+ * Fix installer (after configuration UI)
  * Service check to use Auto (filter by started setting etc.)
  * Add module for relaying events
- * Check multitasking problems on the sockets.
  * Add filtering to WMI module
  * Fix WMI module
- * Check date/time on eventlogs
- * Add support for rendering results (eventlog etc) [In progress]
-
-2006-02-12 MickeM
+ * Fix PDH problems
+
+2006-03-02 MickeM
+ * Fixed bug in INI-file reader (memory leak)
+
+2006-03-01 MickeM
+ * Fixed bug in CheckFile (now dates work correctly)
+
+2006-02-26 MickeM
+ + Added syntax option to CheckFile (%filename%, %creation%, %access%, %write%, %size%).
+
+2006-02-25 MickeM
+ * Fixed Sections problem (now sections can be any size)
+ + Added bind_to_address option to both NRPE and NSClient section in the INI file.
+   Allows you to bind the listener to a specific IP address (only dotted number not host name).
+   This might break things as I had to do some internal rewrite of the Socket classes so be careful :)
+ * Disabled default-debug logging (as things are fairly stable, you can still enable it by using debug=1 in the NSC:ini file)
+ * "Fixed" socket backlog to use "max responsible value" as opposed to "10" if no value is specified.
+ + Added option socket_back_log to both NRPE and NSClient section that allows you to tweak the "back-log" of incoming connections to keep.
+   This is an advanced setting and should not be used. If you get "connection refused" when running many client this might be something you want to tweak though.
+   And if you then start getting "Socket timeout" you might wanna tweak the timeout value as well because larger value here means it takes "longer" to process a socket.
+ - I have looked into the event log problem and dates seem to work here so if anyone still have problems (use the syntax option to debug) let me know.
+ * Moved listpdh and debugpdh into the CheckSystem module
+ * Removed PDH dependencies from "core exe" means you can run NSClient++ without PDH (though you cant use the CheckSystem module)
+ 
+2006-02-2? MickeM
  + Added new Interface for Modules (NSCommandLineExec that allows modules to execute things give from command line.
    Syntax is NSClient++ <module name> <command> [arguments] and if a module doesn't support this it is simply ignored.

trunk/include/SSLSocket.cpp

@@ -118 +118 @@
 }
 
-void simpleSSL::Listener::StartListener(int port) {
+void simpleSSL::Listener::StartListener(std::string host, int port, unsigned int listenQue) {
   // @todo init SSL
 
@@ -141 +141 @@
     simpleSSL::Crypto::setLockingCallback(locking_function);
   }
-
-  tBase::StartListener(port);
+  tBase::StartListener(host, port, listenQue);
 }
 void simpleSSL::Listener::StopListener() {

trunk/include/SSLSocket.h

@@ -285 +285 @@
       context = c;
     }
-    virtual void StartListener(int port);
+    virtual void StartListener(std::string host, int port, unsigned int listenQue);
     virtual void StopListener();
   };

trunk/include/Settings.h

@@ -5 +5 @@
 #include <map>
 #include <windows.h>
+#include <INISettings.h>
 #define BUFF_LEN 4096
-
-class Section {
-};
 
 class SettingsT
 {
 private:
-  typedef std::map<std::string,std::string> saveKeyList;
+  typedef struct {
+    typedef enum { sType, iType} typeEnum;
+    typeEnum type;
+    std::string sVal;
+    int iVal;
+  } valueStruct;
+  typedef std::map<std::string,valueStruct> saveKeyList;
   typedef std::map<std::string,saveKeyList> saveSectionList;
-  std::string file_;
   saveSectionList data_;
   bool bHasInternalData;
+  INISettings iniManager;
 public:
   typedef std::list<std::string> sectionList;
@@ -33 +37 @@
    */
   void setFile(std::string file) {
-    file_ = file;
+    iniManager.setFile(file);
   }
 
-  sectionList getSections() {
-    sectionList ret;
-    char* buffer = new char[BUFF_LEN+1];
-    unsigned int count = ::GetPrivateProfileSectionNames(buffer, BUFF_LEN, file_.c_str());
-    if (count == BUFF_LEN-2)
-      throw "Fuck...";
-    unsigned int last = 0;
-    for (unsigned int i=0;i<count;i++) {
-      if (buffer[i] == '\0') {
-        std::string s = &buffer[last];
-        ret.push_back(s);
-        last = i+1;
+#define UNLIKELY_VALUE -1234
+  void read() {
+    sectionList sections = getSections();
+    for (sectionList::const_iterator it=sections.begin();it!=sections.end();++it) {
+      sectionList section = getSection(*it);
+      for (sectionList::const_iterator it2=section.begin();it2!=section.end();++it2) {
+        int i = getInt((*it), (*it2), UNLIKELY_VALUE);
+        if (i == UNLIKELY_VALUE) {
+          getString((*it), (*it2));
+        }
       }
     }
-    delete [] buffer;
+  }
+
+  sectionList getSections(unsigned int bufferLength = BUFF_LEN) {
+    sectionList ret;
+    ret = iniManager.getSections();
     if (bHasInternalData) {
-      for (saveSectionList::const_iterator it = data_.begin(); it != data_.end(); ++it) {
+      for (saveSectionList::const_iterator kit = data_.begin(); kit != data_.end(); ++kit) {
+        ret.push_back(kit->first);
       }
     }
@@ -65 +72 @@
    * @return A list with all keys from the section
    */
-  sectionList getSection(std::string section) {
+  sectionList getSection(std::string section, unsigned int bufferLength = BUFF_LEN) {
     sectionList ret;
-    char* buffer = new char[BUFF_LEN+1];
-    unsigned int count = GetPrivateProfileSection(section.c_str(), buffer, BUFF_LEN, file_.c_str());
-    if (count == BUFF_LEN-2)
-      throw "Fuck...";
-    unsigned int last = 0;
-    for (unsigned int i=0;i<count;i++) {
-      if (buffer[i] == '\0') {
-        std::string s = &buffer[last];
-        ret.push_back(s);
-        last = i+1;
-      }
-    }
-    delete [] buffer;
+    ret = iniManager.getSection(section);
     if (bHasInternalData) {
       saveSectionList::const_iterator it = data_.find(section);
@@ -105 +100 @@
         saveKeyList::const_iterator kit = it->second.find(key);
         if (kit != it->second.end()) {
-          return kit->second;
+          if (kit->second.type == valueStruct::sType)
+            return kit->second.sVal;
+          else
+            throw "whoops";
         }
       }
     }
-    char* buffer = new char[1024];
-    GetPrivateProfileString(section.c_str(), key.c_str(), defaultValue.c_str(), buffer, 1023, file_.c_str());
-    std::string ret = buffer;
-    delete [] buffer;
+    std::string ret = iniManager.getString(section, key, defaultValue);
     return ret;
   }
@@ -118 +113 @@
   void setString(std::string section, std::string key, std::string value) {
     bHasInternalData = true;
-    (data_[section])[key] = value;
+    (data_[section])[key].sVal = value;
+    (data_[section])[key].type = valueStruct::sType;
   }
 
@@ -129 +125 @@
    */
   int getInt(std::string section, std::string key, int defaultValue = 0) {
-    return GetPrivateProfileInt(section.c_str(), key.c_str(), defaultValue, file_.c_str());
+    return iniManager.getInt(section, key, defaultValue);
+  }
+  void setInt(std::string section, std::string key, int value) {
+    bHasInternalData = true;
+    (data_[section])[key].iVal = value;
+    (data_[section])[key].type = valueStruct::iType;
   }
 };

trunk/include/Socket.h

@@ -101 +101 @@
       this->ioctlsocket(FIONBIO, &NoBlock);
     }
+    static unsigned long inet_addr(std::string addr) {
+      return ::inet_addr(addr.c_str());
+    }
     static std::string getHostByName(std::string ip) {
       hostent* remoteHost;
@@ -128 +131 @@
         throw SocketException("bind failed: ", ::WSAGetLastError());
     }
-    virtual void listen(int backlog = 0) {
+    virtual void listen(int backlog = SOMAXCONN) {
       assert(socket_);
       if (::listen(socket_, backlog) == SOCKET_ERROR)
@@ -215 +218 @@
     typedef Thread<ListenerThread> listenThreadManager;
 
-    u_short port_;
+    u_short bindPort_;
+    u_long bindAddres_;
+    unsigned int listenQue_;
     listenThreadManager threadManager_;
     socketResponses responderList_;
@@ -230 +235 @@
       ListenerThread() : hStopEvent_(NULL) {}
       DWORD threadProc(LPVOID lpParameter);
+      bool hasThread() const {
+        return hStopEvent_ != NULL;
+      }
       void exitThread(void) {
         assert(hStopEvent_ != NULL);
@@ -240 +248 @@
 
   public:
-    Listener() : pHandler_(NULL) {};
+    Listener() : pHandler_(NULL), bindPort_(0), bindAddres_(INADDR_ANY), listenQue_(0) {};
     virtual ~Listener() {
       if (responderList_.size() > 0) {
@@ -265 +273 @@
       }
     };
-
+/*
     virtual void StartListener(int port) {
-      port_ = port;
+      bindPort_ = port;
       threadManager_.createThread(this);
     }
+    */
+    bool hasListener() {
+      try {
+        if (threadManager_.hasActiveThread()) {
+          const ListenerThread *t = threadManager_.getThreadConst();
+          if (t!=NULL)
+            return t->hasThread();
+        }
+      } catch (ThreadException e) {
+        printError(__FILE__, __LINE__, "Could not access listener thread!");
+        return false;
+      }
+      return false;
+    }
+    virtual void StartListener(std::string host, int port, int queLength) {
+      bindPort_ = port;
+      if (!host.empty())
+        bindAddres_ = TListenerType::inet_addr(host);
+      if (bindAddres_ == INADDR_NONE)
+        bindAddres_ = INADDR_ANY;
+      listenQue_ = queLength;
+      threadManager_.createThread(this);
+    }
     virtual void StopListener() {
-      if (threadManager_.hasActiveThread())
-        if (!threadManager_.exitThread())
-          throw new SocketException("Could not terminate thread.");
+      try {
+        if (threadManager_.hasActiveThread())
+          if (!threadManager_.exitThread()) {
+            tBase::close();
+            throw new SocketException("Could not terminate thread.");
+          }
+      } catch (ThreadException e) {
+        tBase::close();
+        throw new SocketException("Could not terminate thread (got exception in thread).");
+      }
       tBase::close();
     }
@@ -385 +423 @@
   try {
     core->socket(AF_INET,SOCK_STREAM,0);
-    core->setAddr(AF_INET, INADDR_ANY, htons(core->port_));
+    core->setAddr(AF_INET, core->bindAddres_, htons(core->bindPort_));
     core->bind();
-    core->listen(10);
+    if (core->listenQue_ != 0)
+      core->listen(core->listenQue_);
+    else
+      core->listen();
     core->setNonBlock();
     while (!(WaitForSingleObject(hStopEvent_, 100) == WAIT_OBJECT_0)) {

trunk/include/config.h

@@ -5 +5 @@
 
 // Version
-#define SZVERSION "0.2.5f 2006-02-14"
+#define SZVERSION "0.2.5h 2006-03-01"
 
 // internal name of the service
@@ -24 +24 @@
 #define NASTY_METACHARS         "|`&><'\"\\[]{}"        /* This may need to be modified for windows directory seperator */
 
+#define DATE_FORMAT "%#c"
+ 
 
 // Default Argument string (for consistency)
@@ -37 +39 @@
 #define NSCLIENT_SETTINGS_VERSION "version"
 #define NSCLIENT_SETTINGS_VERSION_DEFAULT "auto"
+#define NSCLIENT_SETTINGS_BINDADDR "bind_to_address"
+#define NSCLIENT_SETTINGS_BINDADDR_DEFAULT ""
+#define NSCLIENT_SETTINGS_LISTENQUE "socket_back_log"
+#define NSCLIENT_SETTINGS_LISTENQUE_DEFAULT 0
 
 // NRPE Settings headlines
@@ -45 +51 @@
 #define NRPE_SETTINGS_PORT "port"
 #define NRPE_SETTINGS_PORT_DEFAULT 5666
+#define NRPE_SETTINGS_BINDADDR "bind_to_address"
+#define NRPE_SETTINGS_BINDADDR_DEFAULT ""
 #define NRPE_SETTINGS_ALLOW_ARGUMENTS "allow_arguments"
 #define NRPE_SETTINGS_ALLOW_ARGUMENTS_DEFAULT 0
@@ -51 +59 @@
 #define NRPE_SETTINGS_USE_SSL "use_ssl"
 #define NRPE_SETTINGS_USE_SSL_DEFAULT 1
+#define NRPE_SETTINGS_LISTENQUE "socket_back_log"
+#define NRPE_SETTINGS_LISTENQUE_DEFAULT 0
 
 // Check System Settings

trunk/include/strEx.h

@@ -27 +27 @@
     buf[l] = 0;
     return buf;
+  }
+
+  static const __int64 SECS_BETWEEN_EPOCHS = 11644473600;
+  static const __int64 SECS_TO_100NS = 10000000;
+  inline std::string format_filetime(unsigned long long filetime, std::string format) {
+    filetime -= (SECS_BETWEEN_EPOCHS * SECS_TO_100NS);
+    filetime /= SECS_TO_100NS;
+    return format_date(static_cast<time_t>(filetime), format);
   }
 

trunk/modules/CheckDisk/CheckDisk.cpp

@@ -243 +243 @@
 
 struct file_info {
-  file_info() {}
-  file_info(const BY_HANDLE_FILE_INFORMATION info, std::string filename_) : filename(filename_) {
+  file_info() : ullCreationTime(0) {}
+  file_info(const BY_HANDLE_FILE_INFORMATION info, std::string filename_) : filename(filename_), ullCreationTime(0) {
     ullSize = ((info.nFileSizeHigh * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)info.nFileSizeLow);
     ullCreationTime = ((info.ftCreationTime.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)info.ftCreationTime.dwLowDateTime);
@@ -258 +258 @@
   std::string filename;
 
+  std::string render(std::string syntax) {
+    strEx::replace(syntax, "%filename%", filename);
+    strEx::replace(syntax, "%creation%", strEx::format_filetime(ullCreationTime, DATE_FORMAT));
+    strEx::replace(syntax, "%access%", strEx::format_filetime(ullLastAccessTime, DATE_FORMAT));
+    strEx::replace(syntax, "%write%", strEx::format_filetime(ullLastWriteTime, DATE_FORMAT));
+    strEx::replace(syntax, "%size%", strEx::itos_as_BKMG(ullSize));
+    return syntax;
+  }
+
 };
 
@@ -265 +274 @@
   filters::filter_all_times fileAccessed;
   filters::filter_all_times fileWritten;
+  static const __int64 MSECS_TO_100NS = 10000;
 
   inline bool hasFilter() {
@@ -273 +283 @@
     if ((fileSize.hasFilter())&&(fileSize.matchFilter(value.ullSize)))
       return true;
-    else if ((fileCreation.hasFilter())&&(fileCreation.matchFilter(value.ullNow-value.ullCreationTime)))
-      return true;
-    else if ((fileAccessed.hasFilter())&&(fileAccessed.matchFilter(value.ullNow-value.ullLastAccessTime)))
-      return true;
-    else if ((fileWritten.hasFilter())&&(fileWritten.matchFilter(value.ullNow-value.ullLastWriteTime)))
+    else if ((fileCreation.hasFilter())&&(fileCreation.matchFilter((value.ullNow-value.ullCreationTime)/MSECS_TO_100NS)))
+      return true;
+    else if ((fileAccessed.hasFilter())&&(fileAccessed.matchFilter((value.ullNow-value.ullLastAccessTime)/MSECS_TO_100NS)))
+      return true;
+    else if ((fileWritten.hasFilter())&&(fileWritten.matchFilter((value.ullNow-value.ullLastWriteTime)/MSECS_TO_100NS)))
       return true;
     return false;
@@ -317 +327 @@
   bool bError;
   std::string message;
+  std::string syntax;
   unsigned long long now;
   unsigned int hit_count;
@@ -353 +364 @@
       }
       if ((bFilterIn&&bMatch)||(!bFilterIn&&!bMatch)) {
-        strEx::append_list(message, info.filename);
+        strEx::append_list(message, info.render(syntax));
         hit_count++;
       }
@@ -411 +422 @@
   unsigned int truncate = 0;
   CheckFileConatiner query;
+  std::string syntax = "%filename%";
 
   try {
@@ -416 +428 @@
       MAP_OPTIONS_NUMERIC_ALL(query, "")
       MAP_OPTIONS_STR2INT("truncate", truncate)
+      MAP_OPTIONS_STR("syntax", syntax)
       MAP_OPTIONS_PUSH("path", paths)
       MAP_OPTIONS_PUSH("file", paths)
@@ -436 +449 @@
   GetSystemTimeAsFileTime(&now);
   finder.now = ((now.dwHighDateTime * ((unsigned long long)MAXDWORD+1)) + (unsigned long long)now.dwLowDateTime);
-
-
+  finder.syntax = syntax;
   for (std::list<std::string>::const_iterator pit = paths.begin(); pit != paths.end(); ++pit) {
     recursive_scan<file_filter_function>((*pit), finder);
@@ -448 +460 @@
     message = message.substr(0, truncate-4) + "...";
   if (message.empty())
-    message = "CheckFile is ok";
+    message = "CheckFile ok";
   return returnCode;
 }

trunk/modules/CheckDisk/CheckDisk.h

@@ -16 +16 @@
 
   std::string getModuleName() {
-    return "CheckDisk Various Disk related checks.";
+    return "CheckDisk";
   }
   std::string getModuleDescription() {
-    return "CheckDick can check various file and disk related things.\nThe current version has commands to check Size of hard drives and directories.";
+    return "CheckDisk can check various file and disk related things.\nThe current version has commands to check Size of hard drives and directories.";
   }
   NSCModuleWrapper::module_version getModuleVersion() {

trunk/modules/CheckEventLog/CheckEventLog.cpp

@@ -291 +291 @@
           } else {
             strEx::append_list(message, record.eventSource());
-            message += "(" + EventLogRecord::translateType(record.eventType()) + ", " + strEx::itos(record.eventID()) + ", " + EventLogRecord::translateSeverity(record.severity()) + ")";
+            message += "(" + EventLogRecord::translateType(record.eventType()) + ", " + 
+              strEx::itos(record.eventID()) + ", " + EventLogRecord::translateSeverity(record.severity()) + ")";
             message += "[" + record.enumStrings() + "]";
           }

trunk/modules/CheckEventLog/CheckEventLog.h

@@ -2 +2 @@
 
 #include <strEx.h>
+#include <config.h>
 #include <checkHelpers.hpp>
 #include <filter_framework.hpp>
 
-
-#define DATE_FORMAT "%#c"
 
 class CheckEventLog {

trunk/modules/CheckSystem/CheckSystem.cpp

@@ -12 +12 @@
 #include <map>
 
-CheckSystem gNSClientCompat;
+CheckSystem gCheckSystem;
 
 /**
@@ -107 +107 @@
   return false;
 }
-/*
-*/
+
+int CheckSystem::commandLineExec(const char* command,const unsigned int argLen,char** args) {
+  if (stricmp(command, "debugpdh") == 0) {
+    PDH::Enumerations::Objects lst = PDH::Enumerations::EnumObjects();
+    for (PDH::Enumerations::Objects::iterator it = lst.begin();it!=lst.end();++it) {
+      if ((*it).instances.size() > 0) {
+        for (PDH::Enumerations::Instances::const_iterator it2 = (*it).instances.begin();it2!=(*it).instances.end();++it2) {
+          for (PDH::Enumerations::Counters::const_iterator it3 = (*it).counters.begin();it3!=(*it).counters.end();++it3) {
+            std::string counter = "\\" + (*it).name + "(" + (*it2).name + ")\\" + (*it3).name;
+            std::cout << "testing: " << counter << ": ";
+            std::string error;
+            if (PDH::Enumerations::validate(counter, error)) {
+              std::cout << " found ";
+            } else {
+              std::cout << " *NOT* found (" << error << ") " << std::endl;
+              break;
+            }
+            bool bOpend = false;
+            try {
+              PDH::PDHQuery pdh;
+              PDHCollectors::StaticPDHCounterListener<double, PDH_FMT_DOUBLE> cDouble;
+              pdh.addCounter(counter, &cDouble);
+              pdh.open();
+              pdh.gatherData();
+              pdh.close();
+              bOpend = true;
+            } catch (const PDH::PDHException e) {
+              std::cout << " could *not* be open (" << e.getError() << ") " << std::endl;
+              break;
+            }
+            std::cout << " open ";
+            std::cout << std::endl;
+          }
+        }
+      } else {
+        for (PDH::Enumerations::Counters::const_iterator it2 = (*it).counters.begin();it2!=(*it).counters.end();++it2) {
+          std::string counter = "\\" + (*it).name + "\\" + (*it2).name;
+          std::cout << "testing: " << counter << ": ";
+          std::string error;
+          if (PDH::Enumerations::validate(counter, error)) {
+            std::cout << " found ";
+          } else {
+            std::cout << " *NOT* found (" << error << ") " << std::endl;
+            break;
+          }
+          bool bOpend = false;
+          try {
+            PDH::PDHQuery pdh;
+            PDHCollectors::StaticPDHCounterListener<double, PDH_FMT_DOUBLE> cDouble;
+            pdh.addCounter(counter, &cDouble);
+            pdh.open();
+            pdh.gatherData();
+            pdh.close();
+            bOpend = true;
+          } catch (const PDH::PDHException e) {
+            std::cout << " could *not* be open (" << e.getError() << ") " << std::endl;
+            break;
+          }
+          std::cout << " open ";
+          std::cout << std::endl;;
+        }
+      }
+    }
+  } else if (stricmp(command, "listpdh") == 0) {
+    PDH::Enumerations::Objects lst = PDH::Enumerations::EnumObjects();
+    for (PDH::Enumerations::Objects::iterator it = lst.begin();it!=lst.end();++it) {
+      if ((*it).instances.size() > 0) {
+        for (PDH::Enumerations::Instances::const_iterator it2 = (*it).instances.begin();it2!=(*it).instances.end();++it2) {
+          for (PDH::Enumerations::Counters::const_iterator it3 = (*it).counters.begin();it3!=(*it).counters.end();++it3) {
+            std::cout << "\\" << (*it).name << "(" << (*it2).name << ")\\" << (*it3).name << std::endl;;
+          }
+        }
+      } else {
+        for (PDH::Enumerations::Counters::const_iterator it2 = (*it).counters.begin();it2!=(*it).counters.end();++it2) {
+          std::cout << "\\" << (*it).name << "\\" << (*it2).name << std::endl;;
+        }
+      }
+    }
+  }
+  return 0;
+}
+
+
 /**
  * Main command parser and delegator.
@@ -696 +777 @@
   return returnCode;
 }
-NSC_WRAPPERS_MAIN_DEF(gNSClientCompat);
+NSC_WRAPPERS_MAIN_DEF(gCheckSystem);
 NSC_WRAPPERS_IGNORE_MSG_DEF();
-NSC_WRAPPERS_HANDLE_CMD_DEF(gNSClientCompat);
-NSC_WRAPPERS_HANDLE_CONFIGURATION(gNSClientCompat);
+NSC_WRAPPERS_HANDLE_CMD_DEF(gCheckSystem);
+NSC_WRAPPERS_HANDLE_CONFIGURATION(gCheckSystem);
+NSC_WRAPPERS_CLI_DEF(gCheckSystem);
 
 

trunk/modules/CheckSystem/CheckSystem.def

@@ -13 +13 @@
   NSGetConfigurationMeta
   NSGetModuleDescription
+  NSCommandLineExec

trunk/modules/CheckSystem/CheckSystem.h

@@ -4 +4 @@
 
 NSC_WRAPPERS_MAIN();
+NSC_WRAPPERS_CLI();
 
 class CheckSystem {
@@ -34 +35 @@
   */
   std::string getModuleName() {
-    return "System Checks Module.";
+    return "CheckSystem";
   }
   /**
@@ -51 +52 @@
   bool hasMessageHandler();
   NSCAPI::nagiosReturn handleCommand(const strEx::blindstr command, const unsigned int argLen, char **char_args, std::string &msg, std::string &perf);
-
+  int commandLineExec(const char* command,const unsigned int argLen,char** args);
 
   NSCAPI::nagiosReturn checkCPU(const unsigned int argLen, char **char_args, std::string &msg, std::string &perf);
@@ -60 +61 @@
   NSCAPI::nagiosReturn checkCounter(const unsigned int argLen, char **char_args, std::string &msg, std::string &perf);
 
-
 };

trunk/modules/CheckSystem/CheckSystem.vcproj

@@ -178 +178 @@
       </File>
       <File
+        RelativePath=".\CheckSystem.def">
+      </File>
+      <File
         RelativePath="..\..\include\EnumNtSrv.cpp">
       </File>

trunk/modules/CheckWMI/CheckWMI.cpp

@@ -77 +77 @@
       return NSCAPI::returnCRIT;
     }
-    int val = (*vals.begin()).second;
-/*
+    int val = 0; //(*vals.begin()).second;
+
     for (std::map<std::string,int>::const_iterator it = vals.begin(); it != vals.end(); ++it) {
       std::cout << "Values: " << (*it).first << " = " << (*it).second << std::endl;
     }
-    */
+
     query.setDefault(tmpObject);
     query.runCheck(val, returnCode, message, perf);

trunk/modules/NRPEListener/NRPEListener.cpp

@@ -50 +50 @@
   allowedHosts.setAllowedHosts(strEx::splitEx(getAllowedHosts(), ","));
   try {
+    unsigned short port = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_PORT, NRPE_SETTINGS_PORT_DEFAULT);
+    std::string host = NSCModuleHelper::getSettingsString(NRPE_SECTION_TITLE, NRPE_SETTINGS_BINDADDR, NRPE_SETTINGS_BINDADDR_DEFAULT);
+    unsigned int backLog = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_LISTENQUE, NRPE_SETTINGS_LISTENQUE_DEFAULT);
     if (bUseSSL_) {
       socket_ssl_.setHandler(this);
-      socket_ssl_.StartListener(NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_PORT, NRPE_SETTINGS_PORT_DEFAULT));
+      socket_ssl_.StartListener(host, port, backLog);
     } else {
       socket_.setHandler(this);
-      socket_.StartListener(NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_PORT, NRPE_SETTINGS_PORT_DEFAULT));
+      socket_.StartListener(host, port, backLog);
     }
   } catch (simpleSocket::SocketException e) {
@@ -71 +74 @@
     if (bUseSSL_) {
       socket_ssl_.removeHandler(this);
-      socket_ssl_.StopListener();
+      if (socket_ssl_.hasListener())
+        socket_ssl_.StopListener();
     } else {
       socket_.removeHandler(this);
-      socket_.StopListener();
+      if (socket_.hasListener())
+        socket_.StopListener();
     }
   } catch (simpleSocket::SocketException e) {

trunk/modules/NSClientListener/NSClientListener.cpp

@@ -41 +41 @@
 bool NSClientListener::loadModule() {
   allowedHosts.setAllowedHosts(strEx::splitEx(getAllowedHosts(), ","));
+  unsigned short port = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NSCLIENT_SETTINGS_PORT, NSCLIENT_SETTINGS_PORT_DEFAULT);
+  std::string host = NSCModuleHelper::getSettingsString(NRPE_SECTION_TITLE, NSCLIENT_SETTINGS_BINDADDR, NSCLIENT_SETTINGS_BINDADDR_DEFAULT);
+  unsigned int backLog = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_LISTENQUE, NRPE_SETTINGS_LISTENQUE_DEFAULT);
   try {
     socket.setHandler(this);
-    socket.StartListener(NSCModuleHelper::getSettingsInt(NSCLIENT_SECTION_TITLE, NSCLIENT_SETTINGS_PORT, NSCLIENT_SETTINGS_PORT_DEFAULT));
+    socket.StartListener(host, port, backLog);
   } catch (simpleSocket::SocketException e) {
     NSC_LOG_ERROR_STD("Exception caught: " + e.getMessage());
@@ -53 +56 @@
   try {
     socket.removeHandler(this);
-    socket.StopListener();
+    if (socket.hasListener())
+      socket.StopListener();
   } catch (simpleSocket::SocketException e) {
     NSC_LOG_ERROR_STD("Exception caught: " + e.getMessage());

trunk/modules/SysTray/SysTray.cpp

@@ -19 +19 @@
 SysTray::~SysTray() {}
 bool SysTray::loadModule() {
-  std::cout << "Systray: " << serviceControll::GetServiceType(SZSERVICENAME) << std::endl;
-  if ((serviceControll::GetServiceType(SZSERVICENAME)&SERVICE_INTERACTIVE_PROCESS)!=SERVICE_INTERACTIVE_PROCESS) {
+  try {
+    if ((serviceControll::GetServiceType(SZSERVICENAME)&SERVICE_INTERACTIVE_PROCESS)!=SERVICE_INTERACTIVE_PROCESS) {
+      NSC_LOG_ERROR("SysTray is not installed (or it cannot interact with the desktop) SysTray wont be loaded. Run " SZAPPNAME " SysTray install ti change this.");
+      return true;
+    }
+  } catch (serviceControll::SCException e) {
     NSC_LOG_ERROR("SysTray is not installed (or it cannot interact with the desktop) SysTray wont be loaded. Run " SZAPPNAME " SysTray install ti change this.");
     return true;