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 653fcaecfb9424f1cce8013ac29a544e25188d7d..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>


@@ -51,41 +51,28 @@ ControlClient::~ControlClient(void) {
 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) {

-#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__ << ")"
        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
        receiver = new Receiver(7528, host);
 }
 
                << " | port = " << port << endl;
 #endif // DEBUG
        receiver = new Receiver(7528, host);
 }
 

-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
 #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?
-               signal_error().emit(e.serrno(), e.errstr());
-               return;
-       }
-       // TODO sacar signal_connected?
-       connected();

        // TODO Temporal: el receiver empieza a escuchar.
        receiver->run();
        while (!stop()) {
        // TODO Temporal: el receiver empieza a escuchar.
        receiver->run();
        while (!stop()) {

-               HTTPResponse response;
+               Response response;

                try {
                        //Glib::Mutex::Lock lock(socket_mutex);
                        socket >> response;
                try {
                        //Glib::Mutex::Lock lock(socket_mutex);
                        socket >> response;


@@ -107,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;
                }
        }


@@ -131,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;
 }