faltaba un barra n

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

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index 75e330b5d3cfa8898c31e5cd1128e75527c6971f..e4293ae9b835274596c04e947e49510723cd76b0 100644 (file)
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -25,8 +25,10 @@
 // $Id$
 //
 
-#include "plaqui/server/httpresponse.h"
+#include "plaqui/server/response.h"
 #include "plaqui/server/controlclient.h"
+#include <glibmm/timer.h>
+#include <sigc++/class_slot.h>
 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
@@ -42,75 +44,73 @@ ControlClient::~ControlClient(void) {
        cerr << __FILE__ << "(" << __LINE__ << ")"
                << ": destructor." << endl;
 #endif // DEBUG
-       // TODO Temporal: espero que el receiver muera.
-       receiver->finish(true);
+       // FIXME Temporal: espero que el receiver muera.
+       if (receiver) {
+               receiver->finish();
+       }
+       while (receiver) {
+               Glib::usleep(100000); // 0,1 segundo
+       }
 }
 
 ControlClient::ControlClient(const string& _host,
                const Connection::Port& _port) throw(sockerr):
                Connection(sockbuf::sock_stream, _host, _port) {
-#ifdef DEBUG
-       cerr << __FILE__ << "(" << __LINE__ << ")"
-               << ": host = " << host
-               << " | port = " << port << endl;
-#endif // DEBUG
        socket->connect(host.c_str(), port);
        host = socket->localhost();
        port = socket->localport();
 #ifdef DEBUG
        cerr << __FILE__ << "(" << __LINE__ << ")"
-               << ": REAL | host = " << host
+               << ": host = " << host
                << " | port = " << port << endl;
 #endif // DEBUG
+       // FIXME temporal
        receiver = new Receiver(7528, host);
+       receiver->signal_finished().connect(SigC::slot_class(*this,
+                               &ControlClient::on_receiver_finished));
+       receiver->signal_error().connect(SigC::slot_class(*this,
+                               &ControlClient::on_receiver_error));
 }
 
-void ControlClient::real_run(void) {
+void ControlClient::real_run(void) throw() {
 #ifdef DEBUG
        cerr << __FILE__ << "(" << __LINE__ << ")"
                << ": real_run." << endl;
        cerr << ": REAL | host = " << host
                << " | port = " << port << endl;
 #endif // DEBUG
-       try {
-       } catch (const sockerr& e) {
-               // TODO Poner una señal de error específica?
-               error(e.serrno(), e.errstr());
-               return;
-       }
-       // TODO sacar signal_connected?
-       connected();
        // TODO Temporal: el receiver empieza a escuchar.
        receiver->run();
-       while (!stop) {
-               HTTPResponse response;
+       while (!stop()) {
+               Response 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.
-                       error(1000000, "Se desconectó.");
+                       // FIXME poner buenos codigos de error.
+                       signal_error().emit(1000000, "Se desconectó.");
                        return;
                } catch (const sockerr& e) {
-                       error(e.serrno(), e.errstr());
+                       signal_error().emit(e.serrno(), e.errstr());
                        return;
+               } catch (const xmlpp::parse_error& e) {
+                       signal_error().emit(100001, e.what());
+                       continue;
                // Si hay un error al parsear la respuesta.
                } catch (const HTTPResponse::Error& e) {
 #ifdef DEBUG
                        cerr << __FILE__ << "(" << __LINE__ << ")"
                                << " : real_run() ERROR nro: " << e << endl;
 #endif // DEBUG
-                       // TODO - es un error recuperable? O manda señal error()?
-                       error_received(e);
+                       signal_error().emit(e, "La respuesta recibida es inválida");
                        continue;
                }
-               switch (response.status_code) {
-                       case HTTPMessage::OK:
-                               ok_received(response.get_body());
+               switch (response.get_code()) {
+                       case Response::OK:
+                               ok_received(response.get_contents());
                                break;
                        default:
-                               error_received(response.status_code);
+                               error_received(response.get_code(), response.get_description());
                                break;
                }
        }
@@ -120,7 +120,7 @@ void ControlClient::send(const Command& command) {
        try {
                socket << command << flush;
        } catch (const sockerr& e) {
-               error(e.serrno(), e.errstr());
+               signal_error().emit(e.serrno(), e.errstr());
                finish();
        }
 #ifdef DEBUG
@@ -129,8 +129,13 @@ void ControlClient::send(const Command& command) {
 #endif // DEBUG
 }
 
-ControlClient::SignalConnected& ControlClient::signal_connected(void) {
-       return connected;
+void ControlClient::on_receiver_finished(void) {
+       receiver = NULL;
+}
+
+void ControlClient::on_receiver_error(const Runnable::Error& code,
+               const string& desc) {
+       signal_error().emit(code, string("Receiver Error: ") + desc);
 }
 
 ControlClient::SignalOKReceived& ControlClient::signal_ok_received(void) {
@@ -142,7 +147,7 @@ ControlClient::SignalErrorReceived& ControlClient::signal_error_received(void) {
 }
 
 // TODO - temporal
-Receiver::SignalFrameReceived& ControlClient::signal_frame_received(void) {
+ControlClient::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.