Changeset 9bd40e2 in nscp for modules/NRPEServer/NRPEServer.h

Timestamp:

05/06/12 21:25:45 (14 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.1, 0.4.2

Children:

ef5832c

Parents:

53473f7

Message:

• Refactored server internals to be more uniform (This is the first step to adding more protocols like NRDP and unit tests for check_nt)

File:

• modules/NRPEServer/NRPEServer.h (modified) (2 diffs)

modules/NRPEServer/NRPEServer.h

@@ -21 +21 @@
 
 #include <socket_helpers.hpp>
-#include <nrpe/server/server.hpp>
+#include <nrpe/server/protocol.hpp>
+#include "handler_impl.hpp"
 
 NSC_WRAPPERS_MAIN();
 
-class NRPEListener : public nscapi::impl::simple_plugin {
-private:
-  typedef enum {
-    inject, script, script_dir,
-  } command_type;
-  struct command_data {
-    command_data() : type(inject) {}
-    command_data(command_type type_, std::wstring arguments_) : type(type_), arguments(arguments_) {}
-    command_type type;
-    std::wstring arguments;
-  };
-
-  nrpe::server::server::connection_info info_;
-
+class NRPEServer : public nscapi::impl::simple_plugin {
 public:
-  NRPEListener();
-  virtual ~NRPEListener();
+  NRPEServer();
+  virtual ~NRPEServer();
   // Module calls
   bool loadModule();
@@ -67 +55 @@
   NSCAPI::nagiosReturn handleCommand(const strEx::blindstr command, const unsigned int argLen, wchar_t **char_args, std::wstring &message, std::wstring &perf);
   std::wstring getConfigurationMeta();
+  
+private:
+  socket_helpers::connection_info info_;
   boost::shared_ptr<nrpe::server::server> server_;
+  boost::shared_ptr<handler_impl> handler_;
 
-private:
+
   class NRPEException {
     std::wstring error_;