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

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

diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp
index a9cf729fd091c1662b6733c0a0b3b4cb47d914ee..2fd7652d4d3dfda30da0ec3972caa86e8ec1d2dd 100644 (file)
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -57,23 +57,23 @@ ControlServer::ControlServer(const sockbuf::sockdesc& sd):
 #endif // DEBUG
 }
 
-void ControlServer::real_run(void) {
+void ControlServer::real_run(void) throw() {
 #ifdef DEBUG
        cerr << __FILE__ << "(" << __LINE__ << ")"
                << ": real_run()" << endl;
 #endif // DEBUG
        //char buf[BUFSIZ];
-       while (!stop) {
+       while (!stop()) {
                Command command;
                try {
                        //Glib::Mutex::Lock lock(socket_mutex);
                        socket >> command;
                } 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) {
-                       error(e.serrno(), e.errstr());
+                       signal_error().emit(e.serrno(), e.errstr());
                        return;
                // Si se cerró el socket.
                //} catch (const ios::failure& e) {