Changeset 1eef1ee in nscp for NSClient++.cpp

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

File:

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

NSClient++.cpp

@@ -220 +220 @@
  * @return The result, empty string if no result
  */
-int NSClientT::injectRAW(const char* command, const unsigned int argLen, char **argument, char *returnBuffer, unsigned int returnBufferLen) {
+NSCAPI::nagiosReturn NSClientT::injectRAW(const char* command, const unsigned int argLen, char **argument, char *returnMessageBuffer, unsigned int returnMessageBufferLen, char *returnPerfBuffer, unsigned int returnPerfBufferLen) {
   MutexLock lock(pluginMutex);
 
@@ -228 +228 @@
   for (plit = commandHandlers_.begin(); plit != commandHandlers_.end(); ++plit) {
     try {
-      int c = (*plit)->handleCommand(command, argLen, argument, returnBuffer, returnBufferLen);
-      if (c == NSCAPI::handled) {         // module handled the message "we are done..."
-        LOG_DEBUG_STD("Injected Result: " +(std::string) returnBuffer);
-        return c;
-      } else if (c == NSCAPI::isfalse) {      // Module ignored the message
-        LOG_DEBUG("A module ignored this message");
-      } else if (c == NSCAPI::invalidBufferLen) { // Buffer is to small
-        LOG_ERROR("Return buffer to small to handle this command.");
-        return c;
-      } else if (c == NSCAPI::isError) {      // Error
-        LOG_ERROR("An error occured while handling this command.");
-        return c;
-      } else {                  // Something else went wrong...
-        LOG_ERROR_STD("Unknown error from handleCommand: " + strEx::itos(c));
-        return c;
+      NSCAPI::nagiosReturn c = (*plit)->handleCommand(command, argLen, argument, returnMessageBuffer, returnMessageBufferLen, returnPerfBuffer, returnPerfBufferLen);
+      switch (c) {
+        case NSCAPI::returnInvalidBufferLen:
+          LOG_ERROR("Return buffer to small to handle this command.");
+          return c;
+        case NSCAPI::returnIgnored:
+          LOG_DEBUG("A module ignored this message");
+          break;
+        case NSCAPI::returnOK:
+        case NSCAPI::returnWARN:
+        case NSCAPI::returnCRIT:
+        case NSCAPI::returnUNKNOWN:
+          LOG_DEBUG_STD("Injected Result: " +(std::string) returnMessageBuffer);
+          LOG_DEBUG_STD("Injected Performance Result: " +(std::string) returnPerfBuffer);
+          return c;
+        default:
+          LOG_ERROR_STD("Unknown error from handleCommand: " + strEx::itos(c));
+          return c;
       }
     } catch(const NSPluginException& e) {
       LOG_ERROR_STD("Exception raised: " + e.error_ + " in module: " + e.file_);
-      return NSCAPI::isError;
+      return NSCAPI::returnCRIT;
     }
   }
   LOG_MESSAGE_STD("No handler for command: " + command);
-  return NSCAPI::isfalse;
+  return NSCAPI::returnIgnored;
 }
 /**
@@ -271 +274 @@
  * ie. pair<int,string>
  */
+/*
 std::string NSClientT::execute(std::string password, std::string cmd, std::list<std::string> args) {
   MutexLock lock(pluginMutex);
@@ -312 +316 @@
   return ret;
 }
+*/
 /**
  * Report a message to all logging enabled modules.
@@ -372 +377 @@
 
 
-int NSAPIGetSettingsString(const char* section, const char* key, const char* defaultValue, char* buffer, unsigned int bufLen) {
-  return NSCHelper::wrapReturnString(buffer, bufLen, Settings::getInstance()->getString(section, key, defaultValue));
+NSCAPI::errorReturn NSAPIGetSettingsString(const char* section, const char* key, const char* defaultValue, char* buffer, unsigned int bufLen) {
+  return NSCHelper::wrapReturnString(buffer, bufLen, Settings::getInstance()->getString(section, key, defaultValue), NSCAPI::isSuccess);
 }
 int NSAPIGetSettingsInt(const char* section, const char* key, int defaultValue) {
   return Settings::getInstance()->getInt(section, key, defaultValue);
 }
-int NSAPIGetBasePath(char*buffer, unsigned int bufLen) {
-  return NSCHelper::wrapReturnString(buffer, bufLen, mainClient.getBasePath());
-}
-int NSAPIGetApplicationName(char*buffer, unsigned int bufLen) {
-  return NSCHelper::wrapReturnString(buffer, bufLen, SZAPPNAME);
-}
-int NSAPIGetApplicationVersionStr(char*buffer, unsigned int bufLen) {
-  return NSCHelper::wrapReturnString(buffer, bufLen, SZVERSION);
+NSCAPI::errorReturn NSAPIGetBasePath(char*buffer, unsigned int bufLen) {
+  return NSCHelper::wrapReturnString(buffer, bufLen, mainClient.getBasePath(), NSCAPI::isSuccess);
+}
+NSCAPI::errorReturn NSAPIGetApplicationName(char*buffer, unsigned int bufLen) {
+  return NSCHelper::wrapReturnString(buffer, bufLen, SZAPPNAME, NSCAPI::isSuccess);
+}
+NSCAPI::errorReturn NSAPIGetApplicationVersionStr(char*buffer, unsigned int bufLen) {
+  return NSCHelper::wrapReturnString(buffer, bufLen, SZVERSION, NSCAPI::isSuccess);
 }
 void NSAPIMessage(int msgType, const char* file, const int line, const char* message) {
@@ -393 +398 @@
   serviceControll::Stop(SZSERVICENAME);
 }
-int NSAPIInject(const char* command, const unsigned int argLen, char **argument, char *returnBuffer, unsigned int returnBufferLen) {
-  return mainClient.injectRAW(command, argLen, argument, returnBuffer, returnBufferLen);
+NSCAPI::nagiosReturn NSAPIInject(const char* command, const unsigned int argLen, char **argument, char *returnMessageBuffer, unsigned int returnMessageBufferLen, char *returnPerfBuffer, unsigned int returnPerfBufferLen) {
+  return mainClient.injectRAW(command, argLen, argument, returnMessageBuffer, returnMessageBufferLen, returnPerfBuffer, returnPerfBufferLen);
 }