Changeset af05fa1 in nscp for modules/NSCAClient/NSCAClient.cpp

Timestamp:

05/13/12 22:08:01 (13 months ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.1, 0.4.2

Children:

695f240

Parents:

b5a03fe

Message:

• Refactored (same as with server) client internals to be more uniform (Again, next up are NSClient Server and NRDP)

File:

• modules/NSCAClient/NSCAClient.cpp (modified) (3 diffs)

modules/NSCAClient/NSCAClient.cpp

@@ -29 +29 @@
 #include <nsca/nsca_socket.hpp>
 
+#include <nsca/client/nsca_client_protocol.hpp>
+#include <socket/client.hpp>
+
 #include <settings/client/settings_client.hpp>
 #include <nscapi/nscapi_protobuf_functions.hpp>
@@ -378 +381 @@
 // Protocol implementations
 //
-
+struct client_handler : public socket_helpers::client::client_handler {
+  unsigned int encryption_;
+  std::string password_;
+  client_handler(NSCAAgent::connection_data &con) 
+    : socket_helpers::client::client_handler(con.host, con.port, con.timeout, false, "")
+    , encryption_(con.get_encryption())
+    , password_(con.password)
+  {
+
+  }
+  void log_debug(std::string file, int line, std::string msg) const {
+    if (GET_CORE()->should_log(NSCAPI::log_level::debug)) {
+      GET_CORE()->log(NSCAPI::log_level::debug, file, line, utf8::to_unicode(msg));
+    }
+  }
+  void log_error(std::string file, int line, std::string msg) const {
+    if (GET_CORE()->should_log(NSCAPI::log_level::error)) {
+      GET_CORE()->log(NSCAPI::log_level::error, file, line, utf8::to_unicode(msg));
+    }
+  }
+  unsigned int get_encryption() {
+    return encryption_;
+  }
+  std::string get_password() {
+    return password_;
+  }
+};
 boost::tuple<int,std::wstring> NSCAAgent::send(connection_data data, const std::list<nsca::packet> packets) {
   try {
     NSC_DEBUG_MSG_STD(_T("Connection details: ") + data.to_wstring());
+
+    socket_helpers::client::client<nsca::client::protocol<client_handler> > client(boost::shared_ptr<client_handler>(new client_handler(data)));
+    client.connect();
+
+    BOOST_FOREACH(const nsca::packet &packet, packets) {
+      NSC_DEBUG_MSG_STD(_T("Sending (data): ") + utf8::cvt<std::wstring>(packet.to_string()));
+      bool ret = client.process_request(packet);
+    }
+    client.shutdown();
+/*
     boost::asio::io_service io_service;
     nsca::socket socket(io_service);
@@ -395 +434 @@
     }
     socket.shutdown();
+    */
     return boost::make_tuple(NSCAPI::returnUNKNOWN, _T(""));
   } catch (const nsca::nsca_encrypt::encryption_exception &e) {