Se agrega un archivo que falto subir en el ultimo commit XD

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

diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp
index a9cf729fd091c1662b6733c0a0b3b4cb47d914ee..1c253c5e012496521a03072c831a7a8936a80be6 100644 (file)
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -57,23 +57,23 @@ ControlServer::ControlServer(const sockbuf::sockdesc& sd):
 #endif // DEBUG
 }
 
 #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];
 #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.
                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) {
                        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) {
                        return;
                // Si se cerró el socket.
                //} catch (const ios::failure& e) {


@@ -142,7 +142,7 @@ void ControlServer::real_run(void) {
        }
 }
 
        }
 }
 

-void ControlServer::send(const HTTPResponse& response) {
+void ControlServer::send(const Response& response) {

        //Glib::Mutex::Lock lock(socket_mutex);
        socket << response << flush;
 #ifdef DEBUG
        //Glib::Mutex::Lock lock(socket_mutex);
        socket << response << flush;
 #ifdef DEBUG