Changeset 1eef1ee in nscp for modules/NSClientCompat

Timestamp:

03/20/05 20:54:25 (8 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

c6e008c

Parents:

2a94f3f

Message:

*OBS* This might no longer work! (expect updated code in the next few days if things are broken)

• Fundamental API changes (due to NRPE compatibility)
  • HandleCommand? has changed
  • Inject has changed
  • Most API calls have new "return codes" (typedef:ed INT to allow for return code compiler checks)
  • A lot of the old return codes have changed
• Preliminary NRPE support (can parse and execute incoming requests, cant return data yet, and no encryption)
• New SimpleSocket? in include/ will be used as base class for Listeners
• A lot of rewrite to the NSC API

Location:

modules/NSClientCompat

Files:

• NSClientCompat.cpp (modified) (2 diffs)
• NSClientCompat.h (modified) (1 diff)

modules/NSClientCompat/NSClientCompat.cpp

@@ -107 +107 @@
  * @return 
  */
-std::string NSClientCompat::handleCommand(const std::string command, const unsigned int argLen, char **args) {
+NSCAPI::nagiosReturn NSClientCompat::handleCommand(const std::string command, const unsigned int argLen, char **char_args, std::string &msg, std::string &perf) {
   std::list<std::string> stl_args;
   int id = atoi(command.c_str());
   if (id == 0)
-    return "";
+    return NSCAPI::returnIgnored;
   switch (id) {
     case REQ_CLIENTVERSION:
       {
-        std::string version = NSCModuleHelper::getSettingsString("nsclient compat", "version", "modern");
-        if (version == "modern")
-          return NSCModuleHelper::getApplicationName() + " " + NSCModuleHelper::getApplicationVersionString();
-        return version;
+        std::string msg = NSCModuleHelper::getSettingsString("nsclient compat", "version", "modern");
+        if (msg == "modern")
+          msg = NSCModuleHelper::getApplicationName() + " " + NSCModuleHelper::getApplicationVersionString();
+        return NSCAPI::returnOK;
       }
     case REQ_UPTIME:
-      return strEx::itos(pdhCollector->getUptime());
+      msg= strEx::itos(pdhCollector->getUptime());
+      return NSCAPI::returnOK;
 
     case REQ_CPULOAD:
       {
-        stl_args = NSCHelper::arrayBuffer2list(argLen, args);
-        if (stl_args.empty())
-          return "ERROR: Missing argument exception.";
-        std::string ret;
+        stl_args = NSCHelper::arrayBuffer2list(argLen, char_args);
+        if (stl_args.empty()) {
+          msg = "ERROR: Missing argument exception.";
+          return NSCAPI::returnCRIT;
+        }
         while (!stl_args.empty()) {
           std::string s = stl_args.front(); stl_args.pop_front();
           int v = pdhCollector->getCPUAvrage(strEx::stoi(s)*(60/CHECK_INTERVAL));
-          if (v == -1)
-            return ret;
-          if (!ret.empty())
-            ret += "&";
-          ret += strEx::itos(v);
+          if (v == -1) {
+            return NSCAPI::returnOK;
+          }
+          if (!msg.empty())
+            msg += "&";
+          msg += strEx::itos(v);
         }
-        return ret;
+        return NSCAPI::returnOK;
       }
+      /*
     case REQ_SERVICESTATE:
       return NSCommands::serviceState(NSCHelper::arrayBuffer2list(argLen, args));
@@ -152 +156 @@
     case REQ_USEDDISKSPACE:
       return NSCommands::usedDiskSpace(NSCHelper::arrayBuffer2list(argLen, args));
+      */
   }
-  return "";
+  return NSCAPI::returnIgnored;
 }
 

modules/NSClientCompat/NSClientCompat.h

@@ -18 +18 @@
   bool hasCommandHandler();
   bool hasMessageHandler();
-  std::string handleCommand(const std::string command, const unsigned int argLen, char **args);
+  NSCAPI::nagiosReturn handleCommand(const std::string command, const unsigned int argLen, char **char_args, std::string &msg, std::string &perf);
 };