-ahi borre lo que se me escapo

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

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index 2c76de3efc659f8a9cca22d759bf80de915e6fd6..6a33e32f5a1ddd6c44a5005024d423deff2b8d9b 100644 (file)
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -25,6 +25,7 @@
 // $Id$
 //
 
 // $Id$
 //
 

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

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


@@ -45,26 +46,60 @@ ControlClient::~ControlClient(void) {
 ControlClient::ControlClient(string host, int port):
                Connection(sockbuf::sock_stream) {
 #ifdef DEBUG
 ControlClient::ControlClient(string host, int port):
                Connection(sockbuf::sock_stream) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": host" << host
+       cerr << __FILE__ << ": host = " << host

                << " | port = " << port << endl;
 #endif // DEBUG
                << " | port = " << port << endl;
 #endif // DEBUG

-       // FIXME - poner en run().

        socket->connect(host.c_str(), port);
        socket->connect(host.c_str(), port);

+       //if (!socket->is_open()) {
+       //      throw ios::failure("Can't connect!");
+       //}

 }
 
 void ControlClient::real_run(void) {
 #ifdef DEBUG
        cerr << __FILE__ << ": real_run." << endl;
 #endif // DEBUG
 }
 
 void ControlClient::real_run(void) {
 #ifdef DEBUG
        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
 #ifdef DEBUG

-       // FIXME - debería tirar una excepción?
-       if (!socket->is_open()) {
-               cerr << "No se pudo conectar a " << socket->peerhost() <<
-                       ":" << socket->peerport() << "." << endl;
-       } else {
-               cerr << "Conectado a " << socket->peerhost() <<
-                       ":" << socket->peerport() << "." << 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
 }
 
 #endif // DEBUG
 }