- Se limpian un poco las respuestas, ahora lo que van a ser respuestas reales,

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

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index 07c86803346d4dbee1060e0fa3e76f8fa876dfc2..48ef3283427c74f99c7046df90328e1a54c6e108 100644 (file)
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -41,10 +41,12 @@ ControlClient::~ControlClient(void) {
 #ifdef DEBUG
        cerr << __FILE__ << ": destructor." << endl;
 #endif // DEBUG
 #ifdef DEBUG
        cerr << __FILE__ << ": destructor." << endl;
 #endif // DEBUG

+       // TODO Temporal: espero que el receiver muera.
+       receiver.finish(true);

 }
 
 }
 

-ControlClient::ControlClient(string host, int port):
-               Connection(sockbuf::sock_stream), host(host), port(port) {
+ControlClient::ControlClient(const string& host, const Connection::Port& port):
+               Connection(sockbuf::sock_stream, host, port) {

 #ifdef DEBUG
        cerr << __FILE__ << ": host = " << host
                << " | port = " << port << endl;
 #ifdef DEBUG
        cerr << __FILE__ << ": host = " << host
                << " | port = " << port << endl;


@@ -63,10 +65,12 @@ void ControlClient::real_run(void) {
                finish();
                return;
        }
                finish();
                return;
        }

-       host = socket->peerhost();
-       port = socket->peerport();
-       // TODO sacar a la mierda?
+       host = socket->localhost();
+       port = socket->localport();
+       // TODO sacar signal_connected?

        connected();
        connected();

+       // TODO Temporal: el receiver empieza a escuchar.
+       receiver.run();

        while (!stop) {
                HTTPResponse response;
                try {
        while (!stop) {
                HTTPResponse response;
                try {


@@ -115,6 +119,11 @@ ControlClient::SignalErrorReceived& ControlClient::signal_error_received(void) {
        return error_received;
 }
 
        return error_received;
 }
 

+// TODO - temporal
+Receiver::SignalFrameReceived& ControlClient::signal_frame_received(void) {
+       return receiver.signal_frame_received();
+}
+

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