Changeset 294b37b in nscp for modules/NRPEServer

Timestamp:

08/10/10 21:54:31 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

64d42de

Parents:

8988f9e

Message:

Added ssl support (almost, still has hard coded certificate).
ported checksystem to work under the new environment
Added back performance data

Location:

modules/NRPEServer

Files:

• CMakeLists.txt (modified) (2 diffs)
• NRPEServer.cpp (modified) (5 diffs)
• NRPEServer.h (modified) (2 diffs)
• handler_impl.cpp (added)
• handler_impl.hpp (added)
• nrpe_connection.cpp (deleted)
• nrpe_connection.hpp (deleted)
• nrpe_handler.cpp (deleted)
• nrpe_handler.hpp (deleted)
• nrpe_server.cpp (deleted)
• nrpe_server.hpp (deleted)
• stdafx.h (modified) (1 diff)

modules/NRPEServer/CMakeLists.txt

@@ -11 +11 @@
   stdafx.cpp
   "${TARGET}.cpp"
-  nrpe_server.cpp
-  nrpe_connection.cpp
-  nrpe_handler.cpp
-  ${NSCP_INCLUDEDIR}/nrpe/nrpe_packet.cpp
+  "handler_impl.cpp"
+  ${NSCP_INCLUDEDIR}/nrpe/server/server.cpp
+  ${NSCP_INCLUDEDIR}/nrpe/server/connection.cpp
+  ${NSCP_INCLUDEDIR}/nrpe/server/tcp_connection.cpp
+  ${NSCP_INCLUDEDIR}/nrpe/server/ssl_connection.cpp
+  ${NSCP_INCLUDEDIR}/nrpe/packet.cpp
 
   ${NSCP_DEF_PLUGIN_CPP}
@@ -26 +28 @@
     "${TARGET}.h"
     "${TARGET}.def"
-    nrpe_server.hpp
-    nrpe_connection.hpp
-    nrpe_handler.hpp
-    nrpe_parser.hpp
+    "handler_impl.hpp"
+    ${NSCP_INCLUDEDIR}/nrpe/server/server.hpp
+    ${NSCP_INCLUDEDIR}/nrpe/server/connection.hpp
+    ${NSCP_INCLUDEDIR}/nrpe/server/tcp_connection.hpp
+    ${NSCP_INCLUDEDIR}/nrpe/server/ssl_connection.hpp
+    ${NSCP_INCLUDEDIR}/nrpe/server/handler.hpp
+    ${NSCP_INCLUDEDIR}/nrpe/server/parser.hpp
     ${NSCP_INCLUDEDIR}/socket_helpers.hpp
-    ${NSCP_INCLUDEDIR}/nrpe/nrpe_packet.hpp
+    ${NSCP_INCLUDEDIR}/nrpe/packet.hpp
     ${NSCP_INCLUDEDIR}/swap_bytes.hpp
 

modules/NRPEServer/NRPEServer.cpp

@@ -25 +25 @@
 #include <config.h>
 #include <msvc_wrappers.h>
+#include "handler_impl.hpp"
 
 NRPEListener gNRPEListener;
 
-NRPEListener::NRPEListener() : noPerfData_(false), buffer_length_(0) {
+NRPEListener::NRPEListener() : noPerfData_(false), info_(boost::shared_ptr<nrpe::server::handler>(new handler_impl(0))) {
 }
 NRPEListener::~NRPEListener() {
@@ -59 +60 @@
   SETTINGS_REG_PATH(nrpe::SECTION_HANDLERS);
 
-  bUseSSL_ = SETTINGS_GET_BOOL(nrpe::KEYUSE_SSL)==1;
+  info_.use_ssl = SETTINGS_GET_BOOL(nrpe::KEYUSE_SSL)==1;
 
 #ifndef USE_SSL
@@ -69 +70 @@
   noPerfData_ = SETTINGS_GET_INT(nrpe::ALLOW_PERFDATA)==0;
   timeout = SETTINGS_GET_INT(nrpe::READ_TIMEOUT);
-  buffer_length_ = SETTINGS_GET_INT(nrpe::PAYLOAD_LENGTH);
-  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_));
-  NSC_DEBUG_MSG_STD(_T("Loading all commands (from NRPE)"));
+  info_.request_handler->set_payload_length(SETTINGS_GET_INT(nrpe::PAYLOAD_LENGTH));
+  if (info_.request_handler->get_payload_length() != 1024)
+    NSC_DEBUG_MSG_STD(_T("Non-standard buffer length (hope you have recompiled check_nrpe changing #define MAX_PACKETBUFFER_LENGTH = ") + strEx::itos(info_.request_handler->get_payload_length()));
 
   boost::asio::io_service io_service_;
@@ -78 +78 @@
   NSC_DEBUG_MSG_STD(_T("Allowed hosts: ") + allowedHosts.to_string());
   try {
-    NSC_DEBUG_MSG_STD(_T("Starting NRPE socket..."));
-    unsigned short port = SETTINGS_GET_INT(nrpe::PORT);
-    std::wstring host = SETTINGS_GET_STRING(nrpe::BINDADDR);
-    unsigned int backLog = SETTINGS_GET_INT(nrpe::LISTENQUE);
-    unsigned int threadPool = 10;
+    info_.port = to_string(SETTINGS_GET_INT(nrpe::PORT));
+    info_.address = to_string(SETTINGS_GET_STRING(nrpe::BINDADDR));
+    unsigned int backLog = SETTINGS_GET_INT(nrpe::LISTENQUE); // @todo: add to info block
+    info_.thread_pool_size = 10; // @todo Add as option
     if (mode == NSCAPI::normalStart) {
-      server_.reset(new nrpe::server::server(to_string(host), to_string(port), (""), threadPool));
+      if (info_.use_ssl) {
+#ifdef USE_SSL
+        server_.reset(new nrpe::server::server(info_));
+//        NSC_LOG_ERROR_STD(_T("SSL not implemented"));
+//        return false;
+#else
+        NSC_LOG_ERROR_STD(_T("SSL is not supported (not compiled with openssl)"));
+        return false;
+#endif
+      } else {
+        server_.reset(new nrpe::server::server(info_));
+      }
+      if (!server_) {
+        NSC_LOG_ERROR_STD(_T("Failed to create server instance!"));
+        return false;
+      }
       server_->start();
-#ifdef USE_SSL
-      if (bUseSSL_) {
-        //socket_ssl_.setHandler(this);
-        //socket_ssl_.StartListener(host, port, backLog);
-      } else {
-#else
-      {
-#endif
-        //socket_.setHandler(this);
-        //socket_.StartListener(host, port, backLog);
-      }
     }
+  } catch (nrpe::server::nrpe_exception &e) {
+    NSC_LOG_ERROR_STD(_T("Exception caught: ") + e.what());
+    return false;
   } catch (...) {
     NSC_LOG_ERROR_STD(_T("Exception caught: <UNKNOWN EXCEPTION>"));
     return false;
   }
-  root_ = GET_CORE()->getBasePath();
   return true;
 }
@@ -111 +116 @@
       server_->stop();
       server_.reset();
-    }
-#ifdef USE_SSL
-    if (bUseSSL_) {
-      //socket_ssl_.removeHandler(this);
-      //if (socket_ssl_.hasListener())
-      //  socket_ssl_.StopListener();
-    } else {
-#else
-    {
-#endif
-      //socket_.removeHandler(this);
-      //if (socket_.hasListener())
-      //  socket_.StopListener();
     }
   } catch (...) {

modules/NRPEServer/NRPEServer.h

@@ -21 +21 @@
 
 #include <socket_helpers.hpp>
-#include "nrpe_server.hpp"
+#include <nrpe/server/server.hpp>
 
 NSC_WRAPPERS_MAIN();
@@ -40 +40 @@
   socketHelpers::allowedHosts allowedHosts;
   bool noPerfData_;
-  unsigned int buffer_length_;
-  std::wstring root_;
-  bool bUseSSL_;
+  nrpe::server::server::connection_info info_;
 
 public:

modules/NRPEServer/stdafx.h

@@ -47 +47 @@
 #include <NSCAPI.h>
 #include <nscapi/plugin.hpp>
-#include <nrpe/nrpe_packet.hpp>
+#include <nrpe/packet.hpp>