Se corrige bug que hacia que se cuelque la aplicacion cuando no se estaba conectado

[z.facultad/75.42/plaqui.git] / Server / src / controlclient.cpp

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index fd0fdba9e922e3df779ac0cec15b0033af451381..f33fff5f3197989621377d30f6cc3d8d20006494 100644 (file)
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -25,40 +25,95 @@
 // $Id$
 //
 
 // $Id$
 //
 

+#include "plaqui/server/httpresponse.h"

 #include "plaqui/server/controlclient.h"
 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
 
 #include "plaqui/server/controlclient.h"
 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
 

-PlaQui::Server::ControlClient::~ControlClient(void) {
+using namespace std;
+
+namespace PlaQui {
+
+namespace Server {
+
+ControlClient::~ControlClient(void) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": destructor." << std::endl;
+       cerr << __FILE__ << ": destructor." << endl;

 #endif // DEBUG
 }
 
 #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), host(host), port(port) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": host" << host
-               << " | port = " << port << std::endl;
+       cerr << __FILE__ << ": host = " << host
+               << " | port = " << port << endl;

 #endif // DEBUG
 #endif // DEBUG

-       // FIXME - poner en run().
-       socket->connect(host.c_str(), port);

 }
 
 }
 

-void PlaQui::Server::ControlClient::real_run(void) {
+void ControlClient::real_run(void) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": real_run." << std::endl;
+       cerr << __FILE__ << ": real_run." << endl;

 #endif // DEBUG
 #endif // DEBUG

+       try {
+               socket->connect(host.c_str(), port);
+       } catch (const sockerr& e) {
+               // Poner una señal de error específica?
+               error_received(1);
+               finish();
+               return;
+       }
+       // TODO sacar a la mierda?
+       connected();
+       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
 #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(e);
+                       continue;
+               }
+               switch (response.status_code) {
+                       case HTTPMessage::OK:
+                               ok_received();
+                               break;
+                       default:
+                               error_received(response.status_code);
+                               break;
+               }

        }
        }

+}
+
+void ControlClient::send(const Command& command) {
+       socket << command << flush;
+#ifdef DEBUG
+       cerr << __FILE__ << ": send() Enviado!" << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

+ControlClient::SignalConnected& ControlClient::signal_connected(void) {
+       return connected;
+}
+
+ControlClient::SignalOKReceived& ControlClient::signal_ok_received(void) {
+       return ok_received;
+}
+
+ControlClient::SignalErrorReceived& ControlClient::signal_error_received(void) {
+       return error_received;
+}
+
+} // namespace Server
+
+} // namespace PlaQui
+