Changeset 2018659 in nscp for service/NSClient++.cpp

Timestamp:

01/31/10 11:45:02 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

920626f

Parents:

c4d4219

Message:

Added protocol buffers for internal channels (only command as of now) this means this builds lacks "performance data" (as it has yet to be re-added) as well as requires changes to plugins as the API is NEW!

File:

• service/NSClient++.cpp (modified) (7 diffs)

service/NSClient++.cpp

@@ -39 +39 @@
 #include "settings_client.hpp"
 #include "service_manager.hpp"
+
+#include "../proto/plugin.pb.h"
 
 NSClient mainClient(SZSERVICENAME); // Global core instance.
@@ -373 +375 @@
         args += argv[i];
       }
-      nRetCode = mainClient.inject(command, args, L' ', true, msg, perf);
+      nRetCode = mainClient.inject(command, args, msg, perf);
       std::wcout << msg << _T("|") << perf << std::endl;
       mainClient.exitCore(true);
@@ -1022 +1024 @@
 }
 
-NSCAPI::nagiosReturn NSClientT::inject(std::wstring command, std::wstring arguments, wchar_t splitter, bool escape, std::wstring &msg, std::wstring & perf) {
+NSCAPI::nagiosReturn NSClientT::inject(std::wstring command, std::wstring arguments, std::wstring &msg, std::wstring & perf) {
   /*if (shared_client_.get() != NULL && shared_client_->hasMaster()) {
     try {
@@ -1034 +1036 @@
     }
   } else */{
-    unsigned int aLen = 0;
-    wchar_t ** aBuf = arrayBuffer::split2arrayBuffer(arguments, splitter, aLen, escape);
-    unsigned int buf_len = getBufferLength();
-    wchar_t * mBuf = new wchar_t[buf_len+1]; mBuf[0] = '\0';
-    wchar_t * pBuf = new wchar_t[buf_len+1]; pBuf[0] = '\0';
-    NSCAPI::nagiosReturn ret = injectRAW(command.c_str(), aLen, aBuf, mBuf, buf_len, pBuf, buf_len);
-    arrayBuffer::destroyArrayBuffer(aBuf, aLen);
+    PluginCommand::RequestMessage message;
+    PluginCommand::Header *hdr = message.mutable_header();
+    hdr->set_type(PluginCommand::Header_Type_REQUEST);
+    hdr->set_version(PluginCommand::Header_Version_VERSION_1);
+
+    PluginCommand::Request *req = message.add_payload();
+    req->set_command(to_string(command));
+    req->set_version(PluginCommand::Request_Version_VERSION_1);
+
+    std::string args = to_string(arguments);
+    boost::tokenizer<boost::escaped_list_separator<char> > tok(args, boost::escaped_list_separator<char>('\\', ' ', '\"'));
+    BOOST_FOREACH(string s, tok)
+      req->add_arguments(s);
+
+    std::string request, response;
+    message.SerializeToString(&request);
+
+
+
+    NSCAPI::nagiosReturn ret = injectRAW(command.c_str(), request, response);
+    if (response.empty()) {
+      LOG_ERROR(_T("No data retutned from command"));
+      return NSCAPI::returnUNKNOWN;
+    }
+
+    PluginCommand::ResponseMessage rsp_msg;
+    rsp_msg.ParseFromString(response);
+    if (rsp_msg.payload_size() != 1) {
+      LOG_ERROR_STD(_T("Failed to extract return message not 1 payload: ") + strEx::itos(rsp_msg.payload_size()));
+      return NSCAPI::returnUNKNOWN;
+    }
+    msg = to_wstring(rsp_msg.payload(0).message());
     if ( (ret == NSCAPI::returnInvalidBufferLen) || (ret == NSCAPI::returnIgnored) ) {
-      delete [] mBuf;
-      delete [] pBuf;
       return ret;
     }
-    msg = mBuf;
-    perf = pBuf;
-    delete [] mBuf;
-    delete [] pBuf;
     return ret;
   }
@@ -1066 +1087 @@
  * @return The command status
  */
-NSCAPI::nagiosReturn NSClientT::injectRAW(const wchar_t* command, const unsigned int argLen, wchar_t **argument, wchar_t *returnMessageBuffer, unsigned int returnMessageBufferLen, wchar_t *returnPerfBuffer, unsigned int returnPerfBufferLen) {
+NSCAPI::nagiosReturn NSClientT::injectRAW(const wchar_t* command, std::string &request, std::string &response) {
   if (logDebug()) {
-    LOG_DEBUG_STD(_T("Injecting: ") + (std::wstring) command + _T(": ") + arrayBuffer::arrayBuffer2string(argument, argLen, _T(", ")));
+    LOG_DEBUG_STD(_T("Injecting: ") + std::wstring(command) + _T(": {{{") + strEx::strip_hex(to_wstring(request)) + _T("}}}"));
   }
   /*if (shared_client_.get() != NULL && shared_client_->hasMaster()) {
@@ -1093 +1114 @@
     for (pluginList::size_type i = 0; i < commandHandlers_.size(); i++) {
       try {
-        NSCAPI::nagiosReturn c = commandHandlers_[i]->handleCommand(command, argLen, argument, returnMessageBuffer, returnMessageBufferLen, returnPerfBuffer, returnPerfBufferLen);
+        NSCAPI::nagiosReturn c = commandHandlers_[i]->handleCommand(command, request, response);
         switch (c) {
           case NSCAPI::returnInvalidBufferLen:
@@ -1104 +1125 @@
           case NSCAPI::returnCRIT:
           case NSCAPI::returnUNKNOWN:
-            LOG_DEBUG_STD(_T("Injected Result: ") + NSCHelper::translateReturn(c) + _T(" '") + (std::wstring)(returnMessageBuffer) + _T("'"));
-            LOG_DEBUG_STD(_T("Injected Performance Result: '") +(std::wstring)(returnPerfBuffer) + _T("'"));
+            LOG_DEBUG_STD(_T("Result ") + std::wstring(command) + _T(": ") + NSCHelper::translateReturn(c) + _T(" {{{") + strEx::strip_hex(to_wstring(response)) + _T("}}}"));
             return c;
           default: