Se pone un poco mas de orden. Desaparece la ControlClient::signal_connected().

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

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index 653fcaecfb9424f1cce8013ac29a544e25188d7d..130282d5a0824cd405279eba6a7ca0d7f9803611 100644 (file)
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -51,37 +51,24 @@ ControlClient::~ControlClient(void) {
 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__ << ")"
-               << ": REAL | host = " << host
+               << ": host = " << 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
-       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()) {
@@ -131,10 +118,6 @@ void ControlClient::send(const Command& command) {
 #endif // DEBUG
 }
 
-ControlClient::SignalConnected& ControlClient::signal_connected(void) {
-       return connected;
-}
-
 ControlClient::SignalOKReceived& ControlClient::signal_ok_received(void) {
        return ok_received;
 }