Se agrega un archivo que falto subir en el ultimo commit XD

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

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index e744d0d0c8066bf062569c440dea26cbffe46c0e..ac8886aa966f8804c3f8450b49b1f1d38fb321c4 100644 (file)
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -25,7 +25,7 @@
 // $Id$
 //
 
 // $Id$
 //
 

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

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


@@ -43,50 +43,46 @@ ControlClient::~ControlClient(void) {
                << ": destructor." << endl;
 #endif // DEBUG
        // TODO Temporal: espero que el receiver muera.
                << ": destructor." << endl;
 #endif // DEBUG
        // TODO Temporal: espero que el receiver muera.

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

 }
 
 ControlClient::ControlClient(const string& _host,
                const Connection::Port& _port) throw(sockerr):
                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
        cerr << __FILE__ << "(" << __LINE__ << ")"
                << ": host = " << host
                << " | port = " << port << endl;
 #endif // DEBUG
 #ifdef DEBUG
        cerr << __FILE__ << "(" << __LINE__ << ")"
                << ": host = " << host
                << " | port = " << port << endl;
 #endif // DEBUG

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

        receiver = new Receiver(7528, host);
 }
 
        receiver = new Receiver(7528, host);
 }
 

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

 #ifdef DEBUG
        cerr << __FILE__ << "(" << __LINE__ << ")"
                << ": real_run." << endl;
 #ifdef DEBUG
        cerr << __FILE__ << "(" << __LINE__ << ")"
                << ": real_run." << endl;

+       cerr << ": REAL | host = " << host
+               << " | port = " << port << endl;

 #endif // DEBUG
 #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();
        // 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.
                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ó.");
+                       signal_error().emit(1000000, "Se desconectó.");

                        return;
                } catch (const sockerr& e) {
                        return;
                } catch (const sockerr& e) {

-                       error(e.serrno(), e.errstr());
+                       signal_error().emit(e.serrno(), e.errstr());

                        return;
                // Si hay un error al parsear la respuesta.
                } catch (const HTTPResponse::Error& e) {
                        return;
                // Si hay un error al parsear la respuesta.
                } catch (const HTTPResponse::Error& e) {


@@ -98,12 +94,12 @@ void ControlClient::real_run(void) {
                        error_received(e);
                        continue;
                }
                        error_received(e);
                        continue;
                }

-               switch (response.status_code) {
-                       case HTTPMessage::OK:
-                               ok_received(response.get_body());
+               switch (response.xml_code) {
+                       case Response::OK:
+                               ok_received(response.xml_body);

                                break;
                        default:
                                break;
                        default:

-                               error_received(response.status_code);
+                               error_received(response.xml_code);

                                break;
                }
        }
                                break;
                }
        }


@@ -113,7 +109,7 @@ void ControlClient::send(const Command& command) {
        try {
                socket << command << flush;
        } catch (const sockerr& e) {
        try {
                socket << command << flush;
        } catch (const sockerr& e) {

-               error(e.serrno(), e.errstr());
+               signal_error().emit(e.serrno(), e.errstr());

                finish();
        }
 #ifdef DEBUG
                finish();
        }
 #ifdef DEBUG


@@ -122,10 +118,6 @@ void ControlClient::send(const Command& command) {
 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-ControlClient::SignalConnected& ControlClient::signal_connected(void) {
-       return connected;
-}
-

 ControlClient::SignalOKReceived& ControlClient::signal_ok_received(void) {
        return ok_received;
 }
 ControlClient::SignalOKReceived& ControlClient::signal_ok_received(void) {
        return ok_received;
 }