Changeset b0ae738 in nscp for include

Timestamp:

11/14/07 21:41:36 (6 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2, stable

Children:

23c63eb

Parents:

5782414

Message:

2007-11-14 MickeM

+ Added multi-line output support ( issue #91 )

• Improved error handling for external commands
• Fixed an issue with NRPE/NSClient socket-reading (introduced by the socket_timeout)

(and added the scripts folder to the SVN, and hopefully the build as well :)

Location:

include

Files:

• NSCHelper.cpp (modified) (1 diff)
• NSCHelper.h (modified) (1 diff)
• PDHCounter.h (modified) (3 diffs)
• SSLSocket.cpp (modified) (2 diffs)
• SSLSocket.h (modified) (2 diffs)
• Socket.cpp (modified) (2 diffs)
• Socket.h (modified) (1 diff)

include/NSCHelper.cpp

@@ -610 +610 @@
     return NSCAPI::returnIgnored;
   NSCAPI::nagiosReturn ret = NSCHelper::wrapReturnString(returnBufferMessage, returnBufferMessageLen, retMessage, retResult);
+  if (!NSCHelper::isMyNagiosReturn(ret)) {
+    NSC_LOG_ERROR("A module returned an invalid return code");
+  }
   return NSCHelper::wrapReturnString(returnBufferPerf, returnBufferPerfLen, retPerformance, ret);
 }
+
 /**
  * Wrap the NSLoadModule call

include/NSCHelper.h

@@ -46 +46 @@
       return true;
     return false;
+  }
+  inline bool isMyNagiosReturn(NSCAPI::nagiosReturn code) {
+    return code == NSCAPI::returnCRIT || code == NSCAPI::returnOK || code == NSCAPI::returnWARN || code == NSCAPI::returnUNKNOWN 
+      || code == NSCAPI::returnInvalidBufferLen || code == NSCAPI::returnIgnored;
   }
 

include/PDHCounter.h

@@ -201 +201 @@
     }
     virtual ~PDHQuery(void) {
-      if (hQuery_)
-        close();
-      for (CounterList::iterator it = counters_.begin(); it != counters_.end(); it++) {
-        delete (*it);
-      }
-      counters_.clear();
+      removeAllCounters();
     }
 
@@ -220 +215 @@
       return counter;
     }
+    void removeAllCounters() {
+      if (hQuery_)
+        close();
+      for (CounterList::iterator it = counters_.begin(); it != counters_.end(); it++) {
+        delete (*it);
+      }
+      counters_.clear();
+    }
 
     void open() {
@@ -233 +236 @@
     void close() {
       assert(hQuery_ != NULL);
-      DWORD x = PDH_INVALID_HANDLE;
       PDH_STATUS status;
       for (CounterList::iterator it = counters_.begin(); it != counters_.end(); it++) {

include/SSLSocket.cpp

@@ -68 +68 @@
 
 
-void simpleSSL::sSSL::readAll(simpleSocket::DataBuffer &buffer, unsigned int tmpBufferLength /* = 1024*/) {
+bool simpleSSL::sSSL::readAll(simpleSocket::DataBuffer &buffer, unsigned int tmpBufferLength /* = 1024*/) {
   // @todo this could be optimized a bit if we want to
   // If only one buffer is needed we could "reuse" the buffer instead of copying it.
@@ -93 +93 @@
   */
   delete [] tmpBuffer;
+  return n >= 0;
   /*
   if (n <= 0) {

include/SSLSocket.h

@@ -227 +227 @@
       context_ = context;
     }
-    void readAll (simpleSocket::DataBuffer &buffer, unsigned int tmpBufferLength = 1024);
+    bool readAll (simpleSocket::DataBuffer &buffer, unsigned int tmpBufferLength = 1024);
     void send(const char * buf, unsigned int len);
   };
@@ -257 +257 @@
       }
     }
-    virtual void readAll (simpleSocket::DataBuffer &buffer, unsigned int tmpBufferLength = 1024) {
+    virtual bool readAll (simpleSocket::DataBuffer &buffer, unsigned int tmpBufferLength = 1024) {
       try {
-        ssl.readAll(buffer, tmpBufferLength);
+        return ssl.readAll(buffer, tmpBufferLength);
       } catch (simpleSSL::SSLException e) {
         throw simpleSocket::SocketException(e.getMessage());

include/Socket.cpp

@@ -37 +37 @@
  * @param tmpBufferLength Length of temporary buffer to use (generally larger then expected data)
  */
-void simpleSocket::Socket::readAll(DataBuffer& buffer, unsigned int tmpBufferLength /* = 1024*/) {
+bool simpleSocket::Socket::readAll(DataBuffer& buffer, unsigned int tmpBufferLength /* = 1024*/) {
   // @todo this could be optimized a bit if we want to
   // If only one buffer is needed we could "reuse" the buffer instead of copying it.
@@ -55 +55 @@
   }
   delete [] tmpBuffer;
+  return n!=SOCKET_ERROR;
 }
 

include/Socket.h

@@ -226 +226 @@
       return ret;
     }
-    virtual void readAll(DataBuffer &buffer, unsigned int tmpBufferLength = 1024);
+    virtual bool readAll(DataBuffer &buffer, unsigned int tmpBufferLength = 1024);
 
     virtual void socket(int af, int type, int protocol ) {