Changeset 74a8115 in nscp

Timestamp:

02/22/08 07:43:40 (5 years ago)

Author:

Michael Medin <michael@…>

Children:

274362b

Parents:

83d61f0

Message:

• Fixed issues in the NRPE module (now returns the correct status) + Added a lot of "error log" for when the packet size in NRPEListener is not correct

(might make it simpler to diagnose problems)

Location:

trunk

Files:

• changelog (modified) (1 diff)
• modules/NRPEListener/NRPEListener.cpp (modified) (4 diffs)
• modules/NSCAAgent/NSCAThread.cpp (modified) (1 diff)
• modules/NSCAAgent/NSCAThread.h (modified) (1 diff)

trunk/changelog

@@ -7 +7 @@
  * Improved socket performance (would be nice if we could be used as a "hub")
 
-2008-02-19 MickeM
+2008-02-22 MickeM
+ * Fixed issues in the NRPE module (now returns the correct status)
+ + Added a lot of "error log" for when the packet size in NRPEListener is not correct 
+    (might make it simpler to diagnose problems)
+
+2008-02-20 MickeM
  + Added new module NRPEClient that can act as a NRPE client, might be useful for testing things and 
    eventually for relaying events.

trunk/modules/NRPEListener/NRPEListener.cpp

@@ -81 +81 @@
   scriptDirectory_ = NSCModuleHelper::getSettingsString(NRPE_SECTION_TITLE, NRPE_SETTINGS_SCRIPTDIR ,NRPE_SETTINGS_SCRIPTDIR_DEFAULT);
   buffer_length_ = NSCModuleHelper::getSettingsInt(NRPE_SECTION_TITLE, NRPE_SETTINGS_STRLEN, NRPE_SETTINGS_STRLEN_DEFAULT);
+  if (buffer_length_ != 1024)
+    NSC_DEBUG_MSG_STD(_T("Non-standard buffer length (hope you have recompiled check_nrpe changing #define MAX_PACKETBUFFER_LENGTH = ") + strEx::itos(buffer_length_));
   std::list<std::wstring> commands = NSCModuleHelper::getSettingsSection(NRPE_HANDLER_SECTION_TITLE);
   std::list<std::wstring>::const_iterator it;
@@ -276 +278 @@
         break;
       if (!lastReadHasMore) {
+        NSC_LOG_MESSAGE(_T("Could not read a full NRPE packet from socket, only got: ") + strEx::itos(block.getLength()));
         client->close();
         return;
@@ -282 +285 @@
     }
     if (i >= maxWait) {
-      NSC_LOG_ERROR_STD(_T("Timeout reading NRPE-packet (increase socket_timeout)"));
+      NSC_LOG_ERROR_STD(_T("Timeout reading NRPE-packet (increase socket_timeout), we only got: ") + strEx::itos(block.getLength()));
       client->close();
       return;
@@ -317 +320 @@
         return;
       }
+    } else {
+      NSC_LOG_ERROR_STD(_T("We got more then we wanted ") + strEx::itos(NRPEPacket::getBufferLength(buffer_length_)) + _T(", we only got: ") + strEx::itos(block.getLength()));
+      client->close();
+      return;
     }
   } catch (simpleSocket::SocketException e) {

trunk/modules/NSCAAgent/NSCAThread.cpp

@@ -74 +74 @@
     }
   }
-  //NSC_DEBUG_MSG_STD(_T("Result: ") + result.toString());
   return result;
 }

trunk/modules/NSCAAgent/NSCAThread.h

@@ -170 +170 @@
       data->packet_version=static_cast<NSCAPacket::int16_t>(htons(NSCA_PACKET_VERSION_3));
       data->timestamp=static_cast<NSCAPacket::u_int32_t>(htonl(time));
-      data->return_code = code;
+      data->return_code = ntohs(code);
       data->crc32_value=static_cast<NSCAPacket::u_int32_t>(0L);