Changeset 9b3f53c in nscp for modules/NRPEClient/NRPEClient.cpp

Timestamp:

12/06/09 22:23:10 (3 years ago)

Author:

Michael Medin <michael@…>

Branches:

master, 0.4.0, 0.4.1, 0.4.2

Children:

79e734f

Parents:

dcd90b2

Message:

First version of a working NRPE Listener (does not (yet) handle commands but sockets are there and such)

File:

• modules/NRPEClient/NRPEClient.cpp (modified) (6 diffs)

modules/NRPEClient/NRPEClient.cpp

@@ -69 +69 @@
 }
 
-void NRPEClient::add_options(po::options_description &desc, nrpe_connection_data command_data) {
+void NRPEClient::add_options(po::options_description &desc, nrpe_connection_data &command_data) {
   desc.add_options()
     ("help,h", "Show this help message.")
@@ -102 +102 @@
     tokenizer_t tok(args, sep);
     for(tokenizer_t::iterator beg=tok.begin(); beg!=tok.end();++beg){
-      std::wcout << *beg << std::endl;
       list.push_back(*beg);
     }
@@ -192 +191 @@
 NRPEClient::nrpe_result_data NRPEClient::execute_nrpe_command(nrpe_connection_data con, std::wstring arguments) {
   try {
-    NRPEPacket packet;
+    nrpe::packet packet;
     if (!con.no_ssl) {
 #ifdef USE_SSL
-      packet = send_ssl(con.host, con.port, con.timeout, NRPEPacket::make_request(con.get_cli(arguments), con.buffer_length));
+      packet = send_ssl(con.host, con.port, con.timeout, nrpe::packet::make_request(con.get_cli(arguments), con.buffer_length));
 #else
       return nrpe_result_data(NSCAPI::returnUNKNOWN, _T("SSL support not available (compiled without USE_SSL)!"));
 #endif
     } else
-      packet = send_nossl(con.host, con.port, con.timeout, NRPEPacket::make_request(con.get_cli(arguments), con.buffer_length));
+      packet = send_nossl(con.host, con.port, con.timeout, nrpe::packet::make_request(con.get_cli(arguments), con.buffer_length));
     return nrpe_result_data(packet.getResult(), packet.getPayload());
-  } catch (NRPEPacket::NRPEPacketException &e) {
+  } catch (nrpe::nrpe_packet_exception &e) {
     return nrpe_result_data(NSCAPI::returnUNKNOWN, _T("NRPE Packet errro: ") + e.getMessage());
   } catch (std::runtime_error &e) {
@@ -323 +322 @@
   }
 
-  void send(NRPEPacket &packet, boost::posix_time::seconds timeout) {
-    std::vector<char> buf(packet.getBufferLength());
-    write_with_timeout(socket_, socket_, boost::asio::buffer(packet.getBuffer(), packet.getBufferLength()), timeout);
-  }
-  NRPEPacket recv(const NRPEPacket &packet, boost::posix_time::seconds timeout) {
-    std::vector<char> buf(packet.getBufferLength());
+  void send(nrpe::packet &packet, boost::posix_time::seconds timeout) {
+    std::vector<char> buf(packet.get_packet_length());
+    write_with_timeout(socket_, socket_, boost::asio::buffer(packet.create_buffer(), packet.get_packet_length()), timeout);
+  }
+  nrpe::packet recv(const nrpe::packet &packet, boost::posix_time::seconds timeout) {
+    std::vector<char> buf(packet.get_packet_length());
+    std::cout <<  "About to read: " << buf.size() << std::endl;
     read_with_timeout(socket_, socket_, boost::asio::buffer(buf), timeout);
-    return NRPEPacket(&buf[0], buf.size(), packet.getInternalBufferLength());
+    std::cout <<  "Read data: " << buf.size() << std::endl;
+    return nrpe::packet(&buf[0], buf.size(), packet.get_payload_length());
   }
 };
@@ -370 +371 @@
   }
 
-  void send(NRPEPacket &packet, boost::posix_time::seconds timeout) {
+  void send(nrpe::packet &packet, boost::posix_time::seconds timeout) {
     NSC_LOG_CRITICAL(_T("Writing..."));
-    std::vector<char> buf(packet.getBufferLength());
-    write_with_timeout(socket_, socket_.lowest_layer(), boost::asio::buffer(packet.getBuffer(), packet.getBufferLength()), timeout);
+    std::vector<char> buf(packet.get_packet_length());
+    write_with_timeout(socket_, socket_.lowest_layer(), boost::asio::buffer(packet.create_buffer(), packet.get_packet_length()), timeout);
     NSC_LOG_CRITICAL(_T("Written..."));
   }
-  NRPEPacket recv(const NRPEPacket &packet, boost::posix_time::seconds timeout) {
+  nrpe::packet recv(const nrpe::packet &packet, boost::posix_time::seconds timeout) {
     NSC_LOG_CRITICAL(_T("Reading..."));
-    std::vector<char> buf(packet.getBufferLength());
+    std::vector<char> buf(packet.get_packet_length());
     read_with_timeout(socket_, socket_.lowest_layer(), boost::asio::buffer(buf), timeout);
-    return NRPEPacket(&buf[0], buf.size(), packet.getInternalBufferLength());
+    return nrpe::packet(&buf[0], buf.size(), packet.get_payload_length());
     NSC_LOG_CRITICAL(_T("Read..."));
   }
 };
-NRPEPacket NRPEClient::send_ssl(std::wstring host, int port, int timeout, NRPEPacket packet)
+nrpe::packet NRPEClient::send_ssl(std::wstring host, int port, int timeout, nrpe::packet packet)
 {
   boost::asio::io_service io_service;
@@ -397 +398 @@
 #endif
 
-NRPEPacket NRPEClient::send_nossl(std::wstring host, int port, int timeout, NRPEPacket packet)
+nrpe::packet NRPEClient::send_nossl(std::wstring host, int port, int timeout, nrpe::packet packet)
 {
   boost::asio::io_service io_service;