Se pone un poco mas de orden. Desaparece la ControlClient::signal_connected().

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

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index 3ceaa9f4ae53cf3c4439095bee27ddf2ce82da32..130282d5a0824cd405279eba6a7ca0d7f9803611 100644 (file)
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -25,40 +25,116 @@
 // $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__ << "(" << __LINE__ << ")"
+               << ": destructor." << endl;

 #endif // DEBUG
 #endif // DEBUG

+       // TODO Temporal: espero que el receiver muera.
+       // Conectar señal on_receiver_finished() y esperar a que el puntero sea
+       // NULL para saber que terminó.
+       receiver->finish();

 }
 
 }
 

-PlaQui::Server::ControlClient::ControlClient(std::string host, int port):
-               Connection(sockbuf::sock_stream) {
+ControlClient::ControlClient(const string& _host,
+               const Connection::Port& _port) throw(sockerr):
+               Connection(sockbuf::sock_stream, _host, _port) {
+       socket->connect(host.c_str(), port);
+       host = socket->localhost();
+       port = socket->localport();

 #ifdef DEBUG
 #ifdef DEBUG

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

 #endif // DEBUG
 #endif // DEBUG

-       // FIXME - poner en run().
-       socket->connect(host.c_str(), port);
+       receiver = new Receiver(7528, host);

 }
 
 }
 

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

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": real_run." << std::endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": real_run." << endl;
+       cerr << ": REAL | host = " << host
+               << " | port = " << port << endl;

 #endif // DEBUG
 #endif // DEBUG

+       // TODO Temporal: el receiver empieza a escuchar.
+       receiver->run();
+       while (!stop()) {
+               HTTPResponse response;
+               try {
+                       //Glib::Mutex::Lock lock(socket_mutex);
+                       socket >> response;
+               // Si se cerró el socket.
+               } catch (const ios::failure& e) {
+                       // TODO poner buenos codigos de error.
+                       signal_error().emit(1000000, "Se desconectó.");
+                       return;
+               } catch (const sockerr& e) {
+                       signal_error().emit(e.serrno(), e.errstr());
+                       return;
+               // 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__ << "(" << __LINE__ << ")"
+                               << " : real_run() ERROR nro: " << e << endl;
+#endif // DEBUG
+                       // TODO - es un error recuperable? O manda señal error()?
+                       error_received(e);
+                       continue;
+               }
+               switch (response.status_code) {
+                       case HTTPMessage::OK:
+                               ok_received(response.get_body());
+                               break;
+                       default:
+                               error_received(response.status_code);
+                               break;
+               }
+       }
+}
+
+void ControlClient::send(const Command& command) {
+       try {
+               socket << command << flush;
+       } catch (const sockerr& e) {
+               signal_error().emit(e.serrno(), e.errstr());
+               finish();

        }
        }

+#ifdef DEBUG
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": send() Enviado!" << endl;

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

+ControlClient::SignalOKReceived& ControlClient::signal_ok_received(void) {
+       return ok_received;
+}
+
+ControlClient::SignalErrorReceived& ControlClient::signal_error_received(void) {
+       return error_received;
+}
+
+// TODO - temporal
+Receiver::SignalFrameReceived& ControlClient::signal_frame_received(void) {
+       // XXX - cuidado, esto puede dar quilombo si no esta protegido por un mutex,
+       // aunque no deberia porque la señal no es llamada hasta que no se empice
+       // la transmision y la señal se conecta antes de pedir la transmision.
+       return receiver->signal_frame_received();
+}
+
+} // namespace Server
+
+} // namespace PlaQui
+