X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/3974823758f65eda52d7b82d405d57178b75307b..3a8788fb198a1e0590823745f39fbff81056db09:/Server/src/controlclient.cpp?ds=sidebyside diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp index fd0fdba..6a33e32 100644 --- a/Server/src/controlclient.cpp +++ b/Server/src/controlclient.cpp @@ -25,40 +25,85 @@ // $Id$ // +#include "plaqui/server/httpresponse.h" #include "plaqui/server/controlclient.h" #ifdef DEBUG # include #endif // DEBUG -PlaQui::Server::ControlClient::~ControlClient(void) { +using namespace std; + +namespace PlaQui { + +namespace Server { + +ControlClient::~ControlClient(void) { #ifdef DEBUG - std::cerr << __FILE__ << ": destructor." << std::endl; + cerr << __FILE__ << ": destructor." << endl; #endif // DEBUG } -PlaQui::Server::ControlClient::ControlClient(std::string host, int port): - PlaQui::Server::Connection(sockbuf::sock_stream) { +ControlClient::ControlClient(string host, int port): + Connection(sockbuf::sock_stream) { #ifdef DEBUG - std::cerr << __FILE__ << ": host" << host - << " | port = " << port << std::endl; + cerr << __FILE__ << ": host = " << host + << " | port = " << port << endl; #endif // DEBUG - // FIXME - poner en run(). socket->connect(host.c_str(), port); + //if (!socket->is_open()) { + // throw ios::failure("Can't connect!"); + //} } -void PlaQui::Server::ControlClient::real_run(void) { +void ControlClient::real_run(void) { #ifdef DEBUG - std::cerr << __FILE__ << ": real_run." << std::endl; + cerr << __FILE__ << ": real_run." << endl; #endif // DEBUG + while (!stop) { + HTTPResponse response; + try { + //Glib::Mutex::Lock lock(socket_mutex); + socket >> response; + // Si se cerró el socket. + } catch (const ios::failure& e) { + stop = true; + continue; + // Si hay un error al parsear la respuesta. + } catch (const HTTPResponse::Error& e) { #ifdef DEBUG - // FIXME - debería tirar una excepción? - if (!socket->is_open()) { - std::cerr << "No se pudo conectar a " << socket->peerhost() << - ":" << socket->peerport() << "." << std::endl; - } else { - std::cerr << "Conectado a " << socket->peerhost() << - ":" << socket->peerport() << "." << std::endl; + cerr << __FILE__ << " : real_run() ERROR nro: " << e << endl; +#endif // DEBUG + // TODO - pasar como parametro codigo de error o algo. + error_received(); + continue; + } + switch (response.status_code) { + case HTTPMessage::OK: + ok_received(); + break; + default: + error_received(); + break; + } } +} + +ControlClient::SignalOKReceived& ControlClient::signal_ok_received(void) { + return ok_received; +} + +ControlClient::SignalErrorReceived& ControlClient::signal_error_received(void) { + return error_received; +} + +void ControlClient::send(const Command& command) { + socket << command << flush; +#ifdef DEBUG + cerr << __FILE__ << ": send() Enviado!" << endl; #endif // DEBUG } +} // namespace Server + +} // namespace PlaQui +