Se agrega un parametro *provisorio* body a la signal_ok_received para obtener

el cuerpo del mensaje. Se corrige el port y host para que una vez que se conecta
devuelva el host y port local (en vez de a donde nos conectamos).

diff --git a/Server/include/plaqui/server/controlclient.h b/Server/include/plaqui/server/controlclient.h
index 66af2eafbd89624ba99a21078d6922cbfa2dbddd..50ebe2aaf3b4f890cca0d8ebb7860d670b4d2a4c 100644 (file)
--- a/Server/include/plaqui/server/controlclient.h
+++ b/Server/include/plaqui/server/controlclient.h
@@ -47,7 +47,7 @@ namespace Server {
                        typedef SigC::Signal0<void> SignalConnected;
 
                        /// Tipo de señal para indicar que se recibió una respuesta OK.
-                       typedef SigC::Signal0<void> SignalOKReceived;
+                       typedef SigC::Signal1<void, const std::string&> SignalOKReceived;
 
                        /// Tipo de señal para indicar que se recibió un error.
                        typedef SigC::Signal1<void, unsigned> SignalErrorReceived;

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index f33fff5f3197989621377d30f6cc3d8d20006494..07c86803346d4dbee1060e0fa3e76f8fa876dfc2 100644 (file)
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -63,6 +63,8 @@ void ControlClient::real_run(void) {
                finish();
                return;
        }
+       host = socket->peerhost();
+       port = socket->peerport();
        // TODO sacar a la mierda?
        connected();
        while (!stop) {
@@ -85,7 +87,7 @@ void ControlClient::real_run(void) {
                }
                switch (response.status_code) {
                        case HTTPMessage::OK:
-                               ok_received();
+                               ok_received(response.get_body());
                                break;
                        default:
                                error_received(response.status_code);

diff --git a/Server/tests/client_test.cpp b/Server/tests/client_test.cpp
index 4605619ab83cf67dc7ef4addf0d660bc487f7bc8..2bf118a518c389247205fca4ac334d1715b0c59a 100644 (file)
--- a/Server/tests/client_test.cpp
+++ b/Server/tests/client_test.cpp
@@ -46,8 +46,9 @@ void on_connected(void) {
        cout << "   Conectado! :-)" << endl;
 }
 
-void on_ok_received(void) {
+void on_ok_received(const string& body) {
        cout << "   Respuesta recibida: OK! :-D" << endl;
+       cout << "       Body: " << body << endl;
 }
 
 void on_error_received(unsigned code) {