Changeset 5d8cb39 in nscp

Timestamp:

03/21/05 22:03:51 (8 years ago)

Author:

Michael Medin <michael@…>

Children:

091d894

Parents:

55b33c1

Message:

+ Added NRPE return code

• Fixed some return states to NSClientListener (not verified yet, but soon they wil lbe back in order :)

Location:

trunk

Files:

• changelog (modified) (2 diffs)
• modules/NRPEListener/NRPESocket.cpp (modified) (3 diffs)
• modules/NSClientCompat/NSClientCompat.cpp (modified) (3 diffs)
• modules/NSClientCompat/NSClientCompat.h (modified) (2 diffs)
• modules/NSClientCompat/NSCommands.cpp (modified) (7 diffs)
• modules/NSClientCompat/NSCommands.h (modified) (2 diffs)
• modules/NSClientListener/NSClientSocket.cpp (modified) (1 diff)
• modules/NSClientListener/NSClientSocket.h (modified) (1 diff)

trunk/changelog

@@ -1 +1 @@
 2005-03-21 MickeM
  * Fixed BUG in inject command (now things should "work" again, but far from stable)
+ + Added NRPE return code
+ * Fixed some return states to NSClientListener (not verified yet, but soon they wil lbe back in order :)
 
 2005-03-20 MickeM
@@ -8 +10 @@
    - 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
+ + 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
 
 2005-03-19 MickeM
  * Refactored out NSCLient Listener as a separate module
- * Added initial NRPE listener module (not yet implemented only a shell)
+ + Added initial NRPE listener module (not yet implemented only a shell)
  * Changed Module API (Inject function has new syntax)
- * Added some tokenizer function to charEx
- * Added new wrapper function to inject Command
+ + Added some tokenizer function to charEx
+ + Added new wrapper function to inject Command
  * Minor changes in relation to refactor work
 

trunk/modules/NRPEListener/NRPESocket.cpp

@@ -23 +23 @@
 }packet;
 
+static unsigned long crc32_table[256];
+
+/* build the crc table - must be called before calculating the crc value */
+void generate_crc32_table(void){
+  unsigned long crc, poly;
+  int i, j;
+
+  poly=0xEDB88320L;
+  for(i=0;i<256;i++){
+    crc=i;
+    for(j=8;j>0;j--){
+      if(crc & 1)
+        crc=(crc>>1)^poly;
+      else
+        crc>>=1;
+    }
+    crc32_table[i]=crc;
+  }
+
+  return;
+}
+
+/* calculates the CRC 32 value for a buffer */
+unsigned long calculate_crc32(char *buffer, int buffer_size){
+  register unsigned long crc;
+  int this_char;
+  int current_index;
+
+  crc=0xFFFFFFFF;
+
+  for(current_index=0;current_index<buffer_size;current_index++){
+    this_char=(int)buffer[current_index];
+    crc=((crc>>8) & 0x00FFFFFF) ^ crc32_table[(crc ^ this_char) & 0xFF];
+  }
+
+  return (crc ^ 0xFFFFFFFF);
+}
+
 void NRPESocket::onAccept(SOCKET client) {
   NSC_DEBUG_MSG("Accepting connection from remote host");
@@ -28 +66 @@
   SimpleSocketListsner::readAllDataBlock block = SimpleSocketListsner::readAll(client);
   packet *p = reinterpret_cast<packet*>(block.first);
-  /*
-  char* foo = new char[1024];
-  sprintf(foo, "packet_version = %d, packet_type = %d, crc32 = %d, result_code = %d",
-    ntohs(p->packet_version), ntohs(p->packet_type), ntohl(p->crc32_value), ntohs(p->result_code));
-
-  NSC_DEBUG_MSG_STD("Incoming header: " + foo);
-  */
   // @todo Verify versions and stuff, and ofcource add SSL (but thats in the future :)
   NSC_DEBUG_MSG_STD("Incoming data: " + p->buffer);
@@ -40 +71 @@
   charEx::token cmd = charEx::getToken(p->buffer, '!');
   std::string msg, perf;
-  NSCModuleHelper::InjectSplitAndCommand(cmd.first.c_str(), cmd.second, '!', msg, perf);
+  NSCAPI::nagiosReturn ret = NSCModuleHelper::InjectSplitAndCommand(cmd.first.c_str(), cmd.second, '!', msg, perf);
+//QUERY_PACKET
+  packet p2;
+  strncpy(p2.buffer, (msg+"|"+perf).c_str(), 1023);
+  p2.buffer[1023] = 0;
+  p2.packet_type = htons(2);
+  p2.packet_version = htons(2);
+  p2.result_code = htons(static_cast<int>(ret));
+
+  generate_crc32_table();
+  p2.crc32_value = 0;
+  p2.crc32_value = htonl(calculate_crc32(reinterpret_cast<char*>(&p2),sizeof(p2)));
+  send(client, reinterpret_cast<char*>(&p2), sizeof(p2), 0);
 
   delete [] block.first;

trunk/modules/NSClientCompat/NSClientCompat.cpp

@@ -99 +99 @@
  #define REQ_MEMUSE     7 // Works fine!
  //#define REQ_COUNTER    8 // ! - not implemented Have to look at this, if anyone has a sample let me know...
- //#define REQ_FILEAGE    9 // ! - not implemented Dont know how to use
- //#define REQ_INSTANCES  10  // ! - not implemented Dont know how to use
+ //#define REQ_FILEAGE    9 // ! - not implemented Don't know how to use
+ //#define REQ_INSTANCES  10  // ! - not implemented Don't know how to use
  *
  * @param command 
@@ -109 +109 @@
 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;
+  NSClientCompat::returnBundle rb;
   int id = atoi(command.c_str());
   if (id == 0)
@@ -143 +144 @@
         return NSCAPI::returnOK;
       }
-      /*
     case REQ_SERVICESTATE:
-      return NSCommands::serviceState(NSCHelper::arrayBuffer2list(argLen, args));
+      rb = NSCommands::serviceState(NSCHelper::arrayBuffer2list(argLen, char_args));
+      msg = rb.msg_;
+      perf = rb.perf_;
+      return rb.code_;
+
 
     case REQ_PROCSTATE:
-      return NSCommands::procState(NSCHelper::arrayBuffer2list(argLen, args));
+      rb = NSCommands::procState(NSCHelper::arrayBuffer2list(argLen, char_args));
+      msg = rb.msg_;
+      perf = rb.perf_;
+      return rb.code_;
 
     case REQ_MEMUSE:
-      return strEx::itos(pdhCollector->getMemCommitLimit()) + "&" + 
+      msg = strEx::itos(pdhCollector->getMemCommitLimit()) + "&" + 
         strEx::itos(pdhCollector->getMemCommit());
+      return NSCAPI::returnOK;
 
     case REQ_USEDDISKSPACE:
-      return NSCommands::usedDiskSpace(NSCHelper::arrayBuffer2list(argLen, args));
-      */
+      rb = NSCommands::usedDiskSpace(NSCHelper::arrayBuffer2list(argLen, char_args));
+      msg = rb.msg_;
+      perf = rb.perf_;
+      return rb.code_;
   }
   return NSCAPI::returnIgnored;

trunk/modules/NSClientCompat/NSClientCompat.h

@@ +1 @@
+#pragma once
 #include "PDHCollector.h"
 
@@ -7 +8 @@
   PDHCollectorThread pdhThread;
   PDHCollector *pdhCollector;
+
+public:
+  typedef struct rB {
+    NSCAPI::nagiosReturn code_;
+    std::string msg_;
+    std::string perf_;
+    rB(NSCAPI::nagiosReturn code, std::string msg) : code_(code), msg_(msg) {}
+    rB() : code_(NSCAPI::returnUNKNOWN) {}
+  } returnBundle;
 
 public:

trunk/modules/NSClientCompat/NSCommands.cpp

@@ -59 +59 @@
  * @todo Is this correct ? (has never been used so is most likely broken)
  */
-std::string NSCommands::procState(std::list<std::string> args) {
+NSClientCompat::returnBundle NSCommands::procState(std::list<std::string> args) {
   if (args.empty())
-    return "ERROR: Missing argument exception.";
+    return NSClientCompat::returnBundle(NSCAPI::returnCRIT, "ERROR: Missing argument exception.");
   NSPROCLST procs;
   std::string ret;
@@ -72 +72 @@
   } catch (char *c) {
     NSC_LOG_ERROR_STD("ERROR: " + c);
-    return (std::string)("ERROR: ") + c;
+    return NSClientCompat::returnBundle(NSCAPI::returnCRIT, (std::string)"ERROR: " + c);
   }
   for (std::list<std::string>::iterator it = args.begin();it!=args.end();it++) {
@@ -90 +90 @@
   if (ret.empty())
     ret ="All processes are running.";
-  return strEx::itos(state) + "&" + ret;
+  return NSClientCompat::returnBundle(state, ret);
 }
 
@@ -133 +133 @@
  * @return 
  */
-std::string NSCommands::serviceState(std::list<std::string> args) {
+NSClientCompat::returnBundle NSCommands::serviceState(std::list<std::string> args) {
   if (args.empty())
-    return "ERROR: Missing argument exception.";
+    return NSClientCompat::returnBundle(NSCAPI::returnCRIT, "ERROR: Missing argument exception.");
   else {
     std::string ret;
@@ -162 +162 @@
     if (ret.empty())
       ret ="All services are running.";
-    return strEx::itos(nState) + "&" + ret;
+    return NSClientCompat::returnBundle(nState, ret);
   }
 }
@@ -176 +176 @@
  * @return A string with a list of drive usage stats
  */
-std::string NSCommands::usedDiskSpace(std::list<std::string> args) {
+NSClientCompat::returnBundle NSCommands::usedDiskSpace(std::list<std::string> args) {
   if (args.empty())
-    return "ERROR: Missing argument exception.";
+    return NSClientCompat::returnBundle(NSCAPI::returnCRIT, "ERROR: Missing argument exception.");
   std::string ret;
   for (std::list<std::string>::iterator it = args.begin();it!=args.end();it++) {
@@ -185 +185 @@
       path += ":";
     if (GetDriveType(path.c_str()) != DRIVE_FIXED)
-      return "ERROR: Drive is not a fixed drive." + path;
+      return NSClientCompat::returnBundle(NSCAPI::returnCRIT, "ERROR: Drive is not a fixed drive." + path);
     ULARGE_INTEGER freeBytesAvailableToCaller;
     ULARGE_INTEGER totalNumberOfBytes;
     ULARGE_INTEGER totalNumberOfFreeBytes;
     if (!GetDiskFreeSpaceEx(path.c_str(), &freeBytesAvailableToCaller, &totalNumberOfBytes, &totalNumberOfFreeBytes))
-      return "ERROR: Could not get freespace." + path;
+      return NSClientCompat::returnBundle(NSCAPI::returnCRIT, "ERROR: Could not get free space for" + path);
     ret += strEx::itos(static_cast<__int64>(totalNumberOfFreeBytes.QuadPart)) + "&";
     ret += strEx::itos(static_cast<__int64>(totalNumberOfBytes.QuadPart)) + "&";
   }
-  return ret;
+  return NSClientCompat::returnBundle(NSCAPI::returnUNKNOWN, ret);
 }

trunk/modules/NSClientCompat/NSCommands.h

@@ -2 +2 @@
 
 #include <EnumNtSrv.h>
-
+#include "NSClientCompat.h"
 
 
@@ -8 +8 @@
   typedef enum ServiceState { ok = 0, unknown = 1, error = 2 } ServiceState;
   std::string cmdServiceStateCheckItem(bool bShowAll, int &nState, TNtServiceInfo &info);
-  std::string serviceState(std::list<std::string> args);
-  std::string usedDiskSpace(std::list<std::string> args);
-  std::string procState(std::list<std::string> args);
-}
+  NSClientCompat::returnBundle serviceState(std::list<std::string> args);
+  NSClientCompat::returnBundle usedDiskSpace(std::list<std::string> args);
+  NSClientCompat::returnBundle procState(std::list<std::string> args);
+};

trunk/modules/NSClientListener/NSClientSocket.cpp

@@ -85 +85 @@
   std::string message, perf;
   NSCAPI::nagiosReturn ret = NSCModuleHelper::InjectSplitAndCommand(cmd.first.c_str(), cmd.second, '&', message, perf);
-  return NSCHelper::translateReturn(ret) + "&" + message + "|" + perf;
+  int c = atoi(cmd.first.c_str());
+  switch (c) {
+    case REQ_CLIENTVERSION:
+    case REQ_UPTIME:
+    case REQ_CPULOAD:
+    case REQ_USEDDISKSPACE:
+      return message;
+    case REQ_SERVICESTATE:
+    case REQ_PROCSTATE:
+      return NSCHelper::translateReturn(ret) + "&" + message;
+    default:
+      return NSCHelper::translateReturn(ret) + "&" + message + "|" + perf;
+  }
 }
 

trunk/modules/NSClientListener/NSClientSocket.h

@@ -55 +55 @@
 #define DEFAULT_TCP_PORT 12489
 
+#define REQ_CLIENTVERSION 1 // Works fine!
+#define REQ_CPULOAD     2 // Quirks
+#define REQ_UPTIME      3 // Works fine!
+#define REQ_USEDDISKSPACE 4 // Works fine!
+#define REQ_SERVICESTATE  5 // Works fine!
+#define REQ_PROCSTATE   6 // Works fine!
+#define REQ_MEMUSE      7 // Works fine!
+//#define REQ_COUNTER   8 // ! - not implemented Have to look at this, if anyone has a sample let me know...
+//#define REQ_FILEAGE   9 // ! - not implemented Dont know how to use
+//#define REQ_INSTANCES 10  // ! - not implemented Dont know how to use