Changeset b3078b4 in nscp

Timestamp:

11/21/09 17:59:42 (4 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

01a278b

Parents:

92c4b5b

Message:

added some build stuff

Files:

• build.cmake (added)
• service/NSCPlugin.cpp (modified) (1 diff)
• service/NSCPlugin.h (modified) (3 diffs)
• service/NSClient++-2005.vcproj (modified) (1 diff)
• service/NSClient++.cpp (modified) (6 diffs)
• service/NSClient++.h (modified) (6 diffs)
• service/StdAfx.h (modified) (2 diffs)
• service/commands.hpp (added)
• service/logger.hpp (added)

service/NSCPlugin.cpp

@@ -46 +46 @@
   ,lastIsMsgPlugin_(false)
   ,broken_(false)
+  ,plugin_id_(0)
 {
-
+  plugin_id_ = ++last_plugin_id_;
 }
 /*

service/NSCPlugin.h

@@ -108 +108 @@
   dll::dll module_;
   bool broken_;
+  static unsigned int last_plugin_id_;
+  unsigned int plugin_id_;
 
   typedef int (*lpModuleHelperInit)(NSCModuleHelper::lpNSAPILoader f);
@@ -186 +188 @@
     return bLoaded_;
   }
+  unsigned int get_id() const { return plugin_id_; }
 
 private:
@@ -195 +198 @@
 };
 
-
+unsigned int NSCPlugin::last_plugin_id_ = 0;
+
+
+

service/NSClient++-2005.vcproj

@@ -2139 +2139 @@
       </File>
       <File
+        RelativePath=".\commands.hpp"
+        >
+      </File>
+      <File
         RelativePath=".\include\config.h"
         >

service/NSClient++.cpp

@@ -1060 +1060 @@
     }
     for (pluginList::size_type i=0;i<plugins_.size();++i) {
-      NSCPlugin *p = plugins_[i];
+      plugin_type p = plugins_[i];
       if (!moduleList.empty())
         moduleList += _T(", ");
-      moduleList += p->getModule();
-      if (p->getModule() == sModule) {
-        LOG_DEBUG_STD(_T("Found module: ") + p->getName() + _T("..."));
-        try {
-          return p->commandLineExec(command, argLen, args);
-        } catch (NSPluginException e) {
-          LOG_ERROR_STD(_T("Could not execute command: ") + e.error_ + _T(" in ") + e.file_);
-          return -1;
+      if (p) {
+        moduleList += p->getModule();
+        if (p->getModule() == sModule) {
+          LOG_DEBUG_STD(_T("Found module: ") + p->getName() + _T("..."));
+          try {
+            return p->commandLineExec(command, argLen, args);
+          } catch (NSPluginException e) {
+            LOG_ERROR_STD(_T("Could not execute command: ") + e.error_ + _T(" in ") + e.file_);
+            return -1;
+          }
         }
       }
@@ -1123 +1125 @@
     }
     for (pluginList::reverse_iterator it = plugins_.rbegin(); it != plugins_.rend(); ++it) {
-      NSCPlugin *p = *it;
-      if (p == NULL)
+      plugin_type p = *it;
+      if (!p)
         continue;
       try {
@@ -1146 +1148 @@
       return;
     }
+    commands_.remove_all();
     for (pluginList::iterator it = plugins_.begin(); it != plugins_.end();) {
-      NSCPlugin *p = (*it);
+      plugin_type p = (*it);
       try {
-        if (p != NULL && (unloadLoggers|| !p->isLoaded())) {
+        if (!p && (unloadLoggers|| !p->isLoaded())) {
           it = plugins_.erase(it);
-          delete p;
+          //delete p;
           continue;
         }
@@ -1209 +1212 @@
  */
 NSClientT::plugin_type NSClientT::loadPlugin(const boost::filesystem::wpath file) {
-  return addPlugin(new NSCPlugin(file));
+  plugin_type plugin(new NSCPlugin(file));
+  return addPlugin(plugin);
 }
 /**
@@ -1235 +1239 @@
 
 std::wstring NSClientT::describeCommand(std::wstring command) {
-  boost::shared_lock<boost::shared_mutex> readLock(m_mutexRWcmdDescriptions, boost::get_system_time() + boost::posix_time::seconds(5));
-  if (!readLock.owns_lock()) {
-    LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex when trying to get command list."));
-    return _T("Failed to get mutex when describing command: ") + command;
-  }
-  cmdMap::const_iterator cit = cmdDescriptions_.find(command);
-  if (cit == cmdDescriptions_.end())
-    return _T("Command not found: ") + command + _T(", maybe it has not been register?");
-  return (*cit).second;
+  return commands_.describe(command);
 }
 std::list<std::wstring> NSClientT::getAllCommandNames() {
-  std::list<std::wstring> lst;
-  boost::shared_lock<boost::shared_mutex> readLock(m_mutexRWcmdDescriptions, boost::get_system_time() + boost::posix_time::seconds(5));
-  if (!readLock.owns_lock()) {
-    LOG_ERROR(_T("FATAL ERROR: Could not get read-mutex when trying to get command list."));
-    return lst;
-  }
-  for (cmdMap::const_iterator cit = cmdDescriptions_.begin(); cit != cmdDescriptions_.end(); ++cit) {
-    lst.push_back((*cit).first);
-  }
-  return lst;
-}
-void NSClientT::registerCommand(std::wstring cmd, std::wstring desc) {
-  boost::unique_lock<boost::shared_mutex> writeLock(m_mutexRWcmdDescriptions, boost::get_system_time() + boost::posix_time::seconds(10));
-  if (!writeLock.owns_lock()) {
-    LOG_ERROR_STD(_T("FATAL ERROR: Failed to describe command:") + cmd);
-    return;
-  }
-  cmdDescriptions_[cmd] = desc;
+  return commands_.list();
+}
+void NSClientT::registerCommand(unsigned int id, std::wstring cmd, std::wstring desc) {
+  return commands_.register_command(id, cmd, desc);
 }
 
@@ -1578 +1560 @@
   return _T("");
 }
+
+void NSClientT::nsclient_log_error(std::wstring file, int line, std::wstring error) {
+  NSAPIMessage(NSCAPI::error, file.c_str(), line, error);
+}

service/NSClient++.h

@@ -27 +27 @@
 #include <config.h>
 #include <service/system_service.hpp>
+
 #include "NSCPlugin.h"
+#include "commands.hpp"
+#include "logger.hpp"
+
 //#include <nsclient_session.hpp>
 
@@ -55 +59 @@
  *
  */
-class NSClientT /*: public nsclient_session::session_handler_interface*/ {
+class NSClientT : public nsclient::logger /*: public nsclient_session::session_handler_interface*/ {
 
 public:
@@ -88 +92 @@
   };
 
-  typedef NSCPlugin* plugin_type;
+  typedef boost::shared_ptr<NSCPlugin> plugin_type;
   typedef std::vector<plugin_type> pluginList;
-  typedef std::map<std::wstring,std::wstring> cmdMap;
+  //typedef std::map<std::wstring,std::wstring> cmdMap;
   typedef std::list<cached_log_entry> log_cache_type;
   pluginList plugins_;
@@ -99 +103 @@
   boost::timed_mutex messageMutex;
   boost::shared_mutex m_mutexRW;
-  boost::shared_mutex m_mutexRWcmdDescriptions;
-  cmdMap cmdDescriptions_;
+  //boost::shared_mutex m_mutexRWcmdDescriptions;
+  //cmdMap cmdDescriptions_;
   typedef enum log_status {log_unknown, log_looking, log_debug, log_nodebug };
   log_status debug_;
@@ -114 +118 @@
   bool enable_shared_session_;
 
+  nsclient::commands commands_;
+
 
 public:
   // c-tor, d-tor
-  NSClientT(void) : debug_(log_unknown), plugins_loaded_(false), enable_shared_session_(false) {}
+  NSClientT(void) : debug_(log_unknown), plugins_loaded_(false), enable_shared_session_(false), commands_(this) {}
   virtual ~NSClientT(void) {}
   void enableDebug(bool debug = true) {
@@ -137 +143 @@
 #endif
   void service_on_session_changed(DWORD dwSessionId, bool logon, DWORD dwEventType);
+
+
+  // Logger impl
+  void nsclient_log_error(std::wstring file, int line, std::wstring error);
+
 
   // Member functions

service/StdAfx.h

@@ -47 +47 @@
 #include <NSCAPI.h>
 
+#include <boost/shared_ptr.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/locks.hpp>
@@ -52 +53 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
+#include <boost/foreach.hpp>