Changeset 6b690bf in nscp for NSClient++.cpp

Timestamp:

02/03/08 17:15:14 (5 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

b5ef837

Parents:

8b206ee

Message:

+ Added API for scripts to register commands

+ Added command descriptions (for some modules)

• Fixed issue in NRPE that displayed a console window when running commands
• New improved "inject" dialog from the system tray Lists avalible commands, and shows command descriptions and a lot of other improvments.

File:

• NSClient++.cpp (modified) (3 diffs)

NSClient++.cpp

@@ -412 +412 @@
 }
 
+
+std::wstring NSClientT::describeCommand(std::wstring command) {
+  ReadLock readLock(&m_mutexRWcmdDescriptions, true, 5000);
+  if (!readLock.IsLocked()) {
+    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;
+}
+std::list<std::wstring> NSClientT::getAllCommandNames() {
+  std::list<std::wstring> lst;
+  ReadLock readLock(&m_mutexRWcmdDescriptions, true, 5000);
+  if (!readLock.IsLocked()) {
+    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) {
+  WriteLock writeLock(&m_mutexRWcmdDescriptions, true, 10000);
+  if (!writeLock.IsLocked()) {
+    LOG_ERROR_STD(_T("FATAL ERROR: Failed to describe command:") + cmd);
+    return;
+  }
+  cmdDescriptions_[cmd] = desc;
+}
+
 NSCAPI::nagiosReturn NSClientT::inject(std::wstring command, std::wstring arguments, TCHAR splitter, bool escape, std::wstring &msg, std::wstring & perf) {
   unsigned int aLen = 0;
@@ -773 +806 @@
 NSCAPI::errorReturn NSAPIRehash(int flag) {
   return NSCAPI::hasFailed;
+}
+NSCAPI::errorReturn NSAPIDescribeCommand(const TCHAR* command, TCHAR* buffer, unsigned int bufLen) {
+  return NSCHelper::wrapReturnString(buffer, bufLen, mainClient.describeCommand(command), NSCAPI::isSuccess);
+}
+NSCAPI::errorReturn NSAPIGetAllCommandNames(arrayBuffer::arrayBuffer* aBuffer, unsigned int *bufLen) {
+  unsigned int len = 0;
+  *aBuffer = arrayBuffer::list2arrayBuffer(mainClient.getAllCommandNames(), len);
+  *bufLen = len;
+  return NSCAPI::isSuccess;
+}
+NSCAPI::errorReturn NSAPIReleaseAllCommandNamessBuffer(TCHAR*** aBuffer, unsigned int * bufLen) {
+  arrayBuffer::destroyArrayBuffer(*aBuffer, *bufLen);
+  *bufLen = 0;
+  *aBuffer = NULL;
+  return NSCAPI::isSuccess;
+}
+NSCAPI::errorReturn NSAPIRegisterCommand(const TCHAR* cmd,const TCHAR* desc) {
+  mainClient.registerCommand(cmd, desc);
+  return NSCAPI::isSuccess;
 }
 
@@ -813 +865 @@
   if (_wcsicmp(buffer, _T("NSAPIRehash")) == 0)
     return &NSAPIRehash;
+  if (_wcsicmp(buffer, _T("NSAPIDescribeCommand")) == 0)
+    return &NSAPIDescribeCommand;
+  if (_wcsicmp(buffer, _T("NSAPIGetAllCommandNames")) == 0)
+    return &NSAPIGetAllCommandNames;
+  if (_wcsicmp(buffer, _T("NSAPIReleaseAllCommandNamessBuffer")) == 0)
+    return &NSAPIReleaseAllCommandNamessBuffer;
+  if (_wcsicmp(buffer, _T("NSAPIRegisterCommand")) == 0)
+    return &NSAPIRegisterCommand;
+
   return NULL;
 }