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

Timestamp:

01/08/12 22:29:34 (18 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

7354aa1

Parents:

81a6048

Message:

• Fixed some issues in the NRPE decoder
• Added support for forwarding queries (ie. xxx_forward) mainly usefull for python(?) scripts where we can now handconstruct messages for delivery
• Added NRPE unit tests (52 of them)
• Fixed process enumeration API for 64/32 bit

File:

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

service/NSClient++.cpp

@@ -1207 +1207 @@
 }
 int query_helper(NSClientT::plugin_type plugin, std::wstring command, std::vector<std::wstring> arguments, std::string request, std::list<std::string> *responses) {
-  std::string response;
-  if (!plugin->hasCommandHandler())
-    return NSCAPI::returnIgnored;
-  int ret = plugin->handleCommand(command.c_str(), request, response);
-  if (ret != NSCAPI::returnIgnored && !response.empty())
-    responses->push_back(response);
-  return ret;
+  return NSCAPI::returnIgnored;
+//  std::string response;
+//  if (!plugin->hasCommandHandler())
+//    return NSCAPI::returnIgnored;
+//  int ret = plugin->handleCommand(command.c_str(), request, response);
+//  if (ret != NSCAPI::returnIgnored && !response.empty())
+//    responses->push_back(response);
+//  return ret;
 }
 
@@ -1223 +1224 @@
   int ret = load_and_run(module, boost::bind(&query_helper, _1, command, arguments, request, &responses), errors);
 
-  BOOST_FOREACH(std::string &r, responses) {
-    try {
-      std::wstring msg, perf;
-      nscapi::functions::parse_simple_query_response(r, msg, perf);
-      resp.push_back(msg + _T("|") + perf);
-    } catch (std::exception &e) {
-      resp.push_back(_T("Failed to extract return message: ") + utf8::cvt<std::wstring>(e.what()));
-      LOG_ERROR_CORE_STD(resp.back());
-      return NSCAPI::returnUNKNOWN;
-    }
+  nsclient::commands::plugin_type plugin = commands_.get(command);
+  if (!plugin) {
+    LOG_ERROR_CORE(_T("No handler for command: ") + command + _T(" avalible commands: ") + commands_.to_wstring());
+    return NSCAPI::returnUNKNOWN;
+  }
+  std::string response;
+  NSCAPI::nagiosReturn c = plugin->handleCommand(command.c_str(), request, response);
+  try {
+    std::wstring msg, perf;
+    nscapi::functions::parse_simple_query_response(response, msg, perf);
+    resp.push_back(msg + _T("|") + perf);
+  } catch (std::exception &e) {
+    resp.push_back(_T("Failed to extract return message: ") + utf8::cvt<std::wstring>(e.what()));
+    LOG_ERROR_CORE_STD(resp.back());
+    return NSCAPI::returnUNKNOWN;
   }
   BOOST_FOREACH(const std::wstring &e, errors) {