Changeset 55b33c1 in nscp

Timestamp:

03/21/05 08:55:37 (8 years ago)

Author:

Michael Medin <michael@…>

Children:

5d8cb39

Parents:

6db9fb2

Message:

Fixed bug in INject (now things should work, but far from stable)

Location:

trunk

Files:

• changelog (modified) (1 diff)
• include/NSCAPI.h (modified) (3 diffs)
• include/NSCHelper.cpp (modified) (6 diffs)
• include/NSCHelper.h (modified) (3 diffs)
• modules/NSClientListener/NSClientSocket.cpp (modified) (2 diffs)

trunk/changelog

@@ +1 @@
+2005-03-21 MickeM
+ * Fixed BUG in inject command (now things should "work" again, but far from stable)
+
 2005-03-20 MickeM
  * Fundamental API changes (due to NRPE compatibility)

trunk/include/NSCAPI.h

@@ -3 +3 @@
 namespace NSCAPI {
 
+#ifdef DEBUG
   typedef enum {
     returnCRIT = 2,
@@ -11 +12 @@
     returnIgnored = -1
   } nagiosReturn;
-
   typedef enum {
     istrue = 1, 
     isfalse = 0
   } boolReturn;
-
   typedef enum {
     isSuccess = 1, 
@@ -22 +21 @@
     isInvalidBufferLen = -2
   } errorReturn;
-
-
-
-  // Various Nagios codes
-  /*
+#else
   const int returnCRIT = 2;
   const int returnOK = 0;
   const int returnWARN = 1;
   const int returnUNKNOWN = 4;
-  */
-  // Various NSCP extensions
+  const int returnInvalidBufferLen = -2;
+  const int returnIgnored = -1;
+  const int istrue = 1; 
+  const int isfalse = 0;
+  const int isSuccess = 1; 
+  const int hasFailed = 0;
+  const int isInvalidBufferLen = -2;
+  typedef int nagiosReturn;
+  typedef int boolReturn;
+  typedef int errorReturn;
+#endif
 
-//  const int returnInvalidBufferLen = -2;  // The return buffer was to small (might wanna call again with a larger one)
-
-
-//  typedef int returnCodes;
-
-  // Various function Return codes
-//  const int isSuccess = 1;    // Everything went fine
-//  const int hasFailed = 0;    // EVerything went to hell :)
-//  const int isTrue = 1;     // Should be interpreted as "true"
-//  const int isFalse = 0;      // Should be interpreted as "false"
-//  const int isError = -1;     // Should be interpreted as "ERROR"
-//  const int handled = 2;      // The command was handled by this module
 
   // Various message Types

trunk/include/NSCHelper.cpp

@@ -15 +15 @@
 * @return NSCAPI::success unless the buffer is to short then it will be NSCAPI::invalidBufferLen
 */
-/*
+#ifdef DEBUG
+NSCAPI::nagiosReturn NSCHelper::wrapReturnString(char *buffer, unsigned int bufLen, std::string str, NSCAPI::nagiosReturn defaultReturnCode /* = NSCAPI::success */) {
+  if (str.length() >= bufLen)
+    return NSCAPI::returnInvalidBufferLen;
+  strncpy(buffer, str.c_str(), bufLen);
+  return defaultReturnCode;
+}
+NSCAPI::errorReturn NSCHelper::wrapReturnString(char *buffer, unsigned int bufLen, std::string str, NSCAPI::errorReturn defaultReturnCode /* = NSCAPI::success */) {
+  if (str.length() >= bufLen)
+    return NSCAPI::isInvalidBufferLen;
+  strncpy(buffer, str.c_str(), bufLen);
+  return defaultReturnCode;
+}
+#else
 int NSCHelper::wrapReturnString(char *buffer, unsigned int bufLen, std::string str, int defaultReturnCode ) {
   // @todo deprecate this
@@ -23 +36 @@
   return defaultReturnCode;
 }
-*/
-NSCAPI::nagiosReturn NSCHelper::wrapReturnString(char *buffer, unsigned int bufLen, std::string str, NSCAPI::nagiosReturn defaultReturnCode /* = NSCAPI::success */) {
-  if (str.length() >= bufLen)
-    return NSCAPI::returnInvalidBufferLen;
-  strncpy(buffer, str.c_str(), bufLen);
-  return defaultReturnCode;
-}
-NSCAPI::errorReturn NSCHelper::wrapReturnString(char *buffer, unsigned int bufLen, std::string str, NSCAPI::errorReturn defaultReturnCode /* = NSCAPI::success */) {
-  if (str.length() >= bufLen)
-    return NSCAPI::isInvalidBufferLen;
-  strncpy(buffer, str.c_str(), bufLen);
-  return defaultReturnCode;
-}
+#endif
 /**
  * Make a list out of a array of char arrays (arguments type)
@@ -119 +120 @@
   for (unsigned int i=0;i<argLen;i++) {
     char *q = strchr(p, (i<argLen-1)?splitChar:0);
-    unsigned int len = q-p;
+    unsigned int len = static_cast<int>(q-p);
     arrayBuffer[i] = new char[len+1];
     strncpy(arrayBuffer[i], p, len);
@@ -212 +213 @@
  * @throws NSCMHExcpetion When core pointer set is unavailable or an unknown inject error occurs.
  */
-NSCAPI::nagiosReturn NSCModuleHelper::InjectCommandRAW(const char* command, const unsigned int argLen, char **argument, char *returnBuffer, unsigned int returnBufferLen) 
+NSCAPI::nagiosReturn NSCModuleHelper::InjectCommandRAW(const char* command, const unsigned int argLen, char **argument, char *returnMessageBuffer, unsigned int returnMessageBufferLen, char *returnPerfBuffer, unsigned int returnPerfBufferLen) 
 {
   if (!fNSAPIInject)
     throw NSCMHExcpetion("NSCore has not been initiated...");
-  return fNSAPIInject(command, argLen, argument, returnBuffer, returnBufferLen);
+  return fNSAPIInject(command, argLen, argument, returnMessageBuffer, returnMessageBufferLen, returnPerfBuffer, returnPerfBufferLen);
 }
 NSCAPI::nagiosReturn NSCModuleHelper::InjectCommand(const char* command, const unsigned int argLen, char **argument, std::string & message, std::string & perf) 
@@ -222 +223 @@
   if (!fNSAPIInject)
     throw NSCMHExcpetion("NSCore has not been initiated...");
-  char *buffer = new char[BUFF_LEN+1];
-  buffer[0] = 0;
+  char *msgBuffer = new char[BUFF_LEN+1];
+  char *perfBuffer = new char[BUFF_LEN+1];
+  msgBuffer[0] = 0;
+  perfBuffer[0] = 0;
   // @todo message here !
-  NSCAPI::nagiosReturn retC = InjectCommandRAW(command, argLen, argument, buffer, BUFF_LEN);
+  NSCAPI::nagiosReturn retC = InjectCommandRAW(command, argLen, argument, msgBuffer, BUFF_LEN, perfBuffer, BUFF_LEN);
   switch (retC) {
     case NSCAPI::returnIgnored:
@@ -237 +240 @@
     case NSCAPI::returnWARN:
     case NSCAPI::returnUNKNOWN:
-      message = buffer;
-      // @todo perf data 
+      message = msgBuffer;
+      perf = perfBuffer;
       break;
     default:
       throw NSCMHExcpetion("Unknown inject error.");
   }
-  delete [] buffer;
+  delete [] msgBuffer;
+  delete [] perfBuffer;
   return retC;
 }

trunk/include/NSCHelper.h

@@ -9 +9 @@
 namespace NSCHelper
 {
-//  int wrapReturnString(char *buffer, unsigned int bufLen, std::string str, int defaultReturnCode);
+#ifdef DEBUG
   NSCAPI::nagiosReturn wrapReturnString(char *buffer, unsigned int bufLen, std::string str, NSCAPI::nagiosReturn defaultReturnCode);
   NSCAPI::errorReturn wrapReturnString(char *buffer, unsigned int bufLen, std::string str, NSCAPI::errorReturn defaultReturnCode);
+#else
+  int wrapReturnString(char *buffer, unsigned int bufLen, std::string str, int defaultReturnCode);
+#endif
 
   std::list<std::string> arrayBuffer2list(const unsigned int argLen, char **argument);
@@ -87 +90 @@
   typedef void (*lpNSAPIMessage)(int, const char*, const int, const char*);
   typedef NSCAPI::errorReturn (*lpNSAPIStopServer)(void);
-  typedef NSCAPI::nagiosReturn (*lpNSAPIInject)(const char*, const unsigned int, char **, char *, unsigned int );
+  typedef NSCAPI::nagiosReturn (*lpNSAPIInject)(const char*, const unsigned int, char **, char *, unsigned int, char *, unsigned int);
   typedef LPVOID (*lpNSAPILoader)(char*);
 
@@ -96 +99 @@
   int getSettingsInt(std::string section, std::string key, int defaultValue);
   void Message(int msgType, std::string file, int line, std::string message);
-  NSCAPI::nagiosReturn InjectCommandRAW(const char* command, const unsigned int argLen, char **argument, char *returnBuffer, unsigned int returnBufferLen);
+  NSCAPI::nagiosReturn InjectCommandRAW(const char* command, const unsigned int argLen, char **argument, char *returnMessageBuffer, unsigned int returnMessageBufferLen, char *returnPerfBuffer, unsigned int returnPerfBufferLen);
   NSCAPI::nagiosReturn InjectCommand(const char* command, const unsigned int argLen, char **argument, std::string & message, std::string & perf);
   NSCAPI::nagiosReturn InjectSplitAndCommand(const char* command, char* buffer, char splitChar, std::string & message, std::string & perf);

trunk/modules/NSClientListener/NSClientSocket.cpp

@@ -85 +85 @@
   std::string message, perf;
   NSCAPI::nagiosReturn ret = NSCModuleHelper::InjectSplitAndCommand(cmd.first.c_str(), cmd.second, '&', message, perf);
-  // @todo fix some way to interpret return code
-  return message;
+  return NSCHelper::translateReturn(ret) + "&" + message + "|" + perf;
 }
 
@@ -98 +97 @@
     std::string response = parseRequest(buff);  
     NSC_DEBUG_MSG("Outgoing data: " + response);
-    send(client, response.c_str(), response.length(), 0);
+    send(client, response.c_str(), static_cast<int>(response.length()), 0);
   } else {
     std::string str = "ERROR: Unknown socket error";
-    send(client,str.c_str(),str.length(),0);
+    send(client,str.c_str(),static_cast<int>(str.length()),0);
   }
   delete [] buff;