Se corrige el XML a mano para probarlo.

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

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index 48ef3283427c74f99c7046df90328e1a54c6e108..e4293ae9b835274596c04e947e49510723cd76b0 100644 (file)
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -25,8 +25,10 @@
 // $Id$
 //
 
 // $Id$
 //
 

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

 #include "plaqui/server/controlclient.h"
 #include "plaqui/server/controlclient.h"

+#include <glibmm/timer.h>
+#include <sigc++/class_slot.h>

 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG


@@ -39,76 +41,101 @@ namespace Server {
 
 ControlClient::~ControlClient(void) {
 #ifdef DEBUG
 
 ControlClient::~ControlClient(void) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": destructor." << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": destructor." << endl;

 #endif // DEBUG
 #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):
-               Connection(sockbuf::sock_stream, host, port) {
+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

-       cerr << __FILE__ << ": host = " << host
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": host = " << host

                << " | port = " << port << endl;
 #endif // DEBUG
                << " | 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
 #ifdef DEBUG

-       cerr << __FILE__ << ": real_run." << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": real_run." << endl;
+       cerr << ": REAL | host = " << host
+               << " | port = " << port << 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;
-       }
-       host = socket->localhost();
-       port = socket->localport();
-       // TODO sacar signal_connected?
-       connected();

        // TODO Temporal: el receiver empieza a escuchar.
        // TODO Temporal: el receiver empieza a escuchar.

-       receiver.run();
-       while (!stop) {
-               HTTPResponse response;
+       receiver->run();
+       while (!stop()) {
+               Response response;

                try {
                try {

-                       //Glib::Mutex::Lock lock(socket_mutex);

                        socket >> response;
                // Si se cerró el socket.
                } catch (const ios::failure& e) {
                        socket >> response;
                // Si se cerró el socket.
                } catch (const ios::failure& e) {

-                       stop = true;
+                       // FIXME poner buenos codigos de error.
+                       signal_error().emit(1000000, "Se desconectó.");
+                       return;
+               } catch (const sockerr& e) {
+                       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
                        continue;
                // Si hay un error al parsear la respuesta.
                } catch (const HTTPResponse::Error& e) {
 #ifdef DEBUG

-                       cerr << __FILE__ << " : real_run() ERROR nro: " << e << endl;
+                       cerr << __FILE__ << "(" << __LINE__ << ")"
+                               << " : real_run() ERROR nro: " << e << endl;

 #endif // DEBUG
 #endif // DEBUG

-                       // TODO - pasar como parametro codigo de error o algo.
-                       error_received(e);
+                       signal_error().emit(e, "La respuesta recibida es inválida");

                        continue;
                }
                        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:
                                break;
                        default:

-                               error_received(response.status_code);
+                               error_received(response.get_code(), response.get_description());

                                break;
                }
        }
 }
 
 void ControlClient::send(const Command& command) {
                                break;
                }
        }
 }
 
 void ControlClient::send(const Command& command) {

-       socket << command << flush;
+       try {
+               socket << command << flush;
+       } catch (const sockerr& e) {
+               signal_error().emit(e.serrno(), e.errstr());
+               finish();
+       }

 #ifdef DEBUG
 #ifdef DEBUG

-       cerr << __FILE__ << ": send() Enviado!" << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": send() Enviado!" << endl;

 #endif // DEBUG
 }
 
 #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) {
 }
 
 ControlClient::SignalOKReceived& ControlClient::signal_ok_received(void) {


@@ -120,8 +147,11 @@ ControlClient::SignalErrorReceived& ControlClient::signal_error_received(void) {
 }
 
 // TODO - temporal
 }
 
 // TODO - temporal

-Receiver::SignalFrameReceived& ControlClient::signal_frame_received(void) {
-       return receiver.signal_frame_received();
+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.
+       return receiver->signal_frame_received();

 }
 
 } // namespace Server
 }
 
 } // namespace Server