Changeset 40970de in nscp for modules/NRPEServer

Timestamp:

02/11/10 19:44:30 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

47bcf6f

Parents:

1d4878e

Message:

Preliminary NSCA support (much is hard coded right now so only a PoC not a finished concept)

Location:

modules/NRPEServer

Files:

• CMakeLists.txt (modified) (2 diffs)
• nrpe_connection.cpp (modified) (1 diff)
• nrpe_handler.hpp (modified) (1 diff)
• nrpe_parser.hpp (modified) (3 diffs)
• stdafx.h (modified) (1 diff)

modules/NRPEServer/CMakeLists.txt

@@ -14 +14 @@
   nrpe_connection.cpp
   nrpe_handler.cpp
-  ${NSCP_INCLUDE_PATH}/nrpe/nrpepacket.cpp
+  ${NSCP_INCLUDE_PATH}/nrpe/nrpe_packet.cpp
 
   ${NSCP_DEF_PLUGIN_CPP}
@@ -30 +30 @@
     nrpe_handler.hpp
     nrpe_parser.hpp
-    ${NSCP_INCLUDE_PATH}/nrpe/nrpepacket.hpp
     ${NSCP_INCLUDE_PATH}/socket_helpers.hpp
+    ${NSCP_INCLUDE_PATH}/nrpe/nrpe_packet.hpp
+    ${NSCP_INCLUDE_PATH}/swap_bytes.hpp
 
     ${NSCP_DEF_PLUGIN_HPP}

modules/NRPEServer/nrpe_connection.cpp

@@ -41 +41 @@
           boost::tie(result, begin) = parser_.digest(begin, end);
           if (begin == old_begin) {
-            std::cout << "Whoops, this is wrong...";
+            handler_.create_error(_T("Something strange happened..."));
             return;
           }

modules/NRPEServer/nrpe_handler.hpp

@@ -1 @@
-#include <nrpe/nrpepacket.hpp>
+#include <nrpe/nrpe_packet.hpp>
 #include <boost/tuple/tuple.hpp>
 

modules/NRPEServer/nrpe_parser.hpp

@@ -1 @@
-#include <nrpe/nrpepacket.hpp>
+#include <nrpe/nrpe_packet.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/noncopyable.hpp>
@@ -13 +13 @@
         : payload_length_(payload_length)
         , packet_length_(nrpe::length::get_packet_length(payload_length))
-      {
-        std::cout << "== ctor length: " << payload_length_ << "/" << packet_length_ << std::endl;
-      }
+      {}
 
       template <typename InputIterator>
       boost::tuple<bool, InputIterator> digest(InputIterator begin, InputIterator end) {
-        std::cout << "== Parsing: " << payload_length_ << "/" << packet_length_ << std::endl;
         int count = packet_length_ - buffer_.size();
-        std::cout << "Bytes already: " << buffer_.size() << ", need more: " << count << " got: " << (end-begin) << std::endl;
         for (; count > 0&& begin != end; ++begin, --count)
           buffer_.push_back(*begin);
@@ -35 +31 @@
         payload_length_ = length;
         packet_length_ = nrpe::length::get_packet_length(length);
-        std::cout << "== Setting length: " << payload_length_ << "/" << packet_length_ << std::endl;
       }
     };

modules/NRPEServer/stdafx.h

@@ -48 +48 @@
 #include <NSCHelper.h>
 #include <nsc_module_wrapper.hpp>
-#include <nrpe/nrpepacket.hpp>
+#include <nrpe/nrpe_packet.hpp>