- Se agrega una version basica de la respuesta XML.

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

diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp
index 23f89c40f0a0f53a561b5991658ebb5f13f64bcc..1c253c5e012496521a03072c831a7a8936a80be6 100644 (file)
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -44,36 +44,47 @@ namespace Server {
 
 ControlServer::~ControlServer(void) {
 #ifdef DEBUG
 
 ControlServer::~ControlServer(void) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": destructor." << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": destructor." << endl;

 #endif // DEBUG
 }
 
 ControlServer::ControlServer(const sockbuf::sockdesc& sd):
                Connection(sd) {
 #ifdef DEBUG
 #endif // DEBUG
 }
 
 ControlServer::ControlServer(const sockbuf::sockdesc& sd):
                Connection(sd) {
 #ifdef DEBUG

-       cerr << __FILE__ << ": sd = " << sd.sock << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": sd = " << sd.sock << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-void ControlServer::real_run(void) {
+void ControlServer::real_run(void) throw() {

 #ifdef DEBUG
 #ifdef DEBUG

-       cerr << __FILE__ << ": real_run()" << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": real_run()" << endl;

 #endif // DEBUG
        //char buf[BUFSIZ];
 #endif // DEBUG
        //char buf[BUFSIZ];

-       while (!stop) {
+       while (!stop()) {

                Command command;
                try {
                        //Glib::Mutex::Lock lock(socket_mutex);
                        socket >> command;
                Command command;
                try {
                        //Glib::Mutex::Lock lock(socket_mutex);
                        socket >> command;

-               // Si se cerró el socket.

                } catch (const ios::failure& e) {
                } catch (const ios::failure& e) {

-                       stop = true;
-                       continue;
+                       // TODO poner buenos codigos de error.
+                       signal_error().emit(1000000, "Se desconectó.");
+                       return;
+               } catch (const sockerr& e) {
+                       signal_error().emit(e.serrno(), e.errstr());
+                       return;
+               // Si se cerró el socket.
+               //} catch (const ios::failure& e) {
+               //      stop = true;
+               //      continue;

                // Si hay un error al parsear el comando, se envia una respuesta con el
                // error.
                } catch (const HTTPError& e) {
 #ifdef DEBUG
                // Si hay un error al parsear el comando, se envia una respuesta con el
                // error.
                } catch (const HTTPError& e) {
 #ifdef DEBUG

-                       cerr << __FILE__ << " : real_run() ERROR: status_code = "
+                       cerr << __FILE__ << "(" << __LINE__ << ")"
+                               << " : real_run() ERROR: status_code = "

                                << e.code << " | reason = " << HTTPMessage::reason(e.code)
                                << " | desc = " << e.what() << endl;
 #endif // DEBUG
                                << e.code << " | reason = " << HTTPMessage::reason(e.code)
                                << " | desc = " << e.what() << endl;
 #endif // DEBUG


@@ -89,7 +100,8 @@ void ControlServer::real_run(void) {
                bool is_first = true;
                while (!stop && socket.getline(buf, BUFSIZ)) {
 #ifdef DEBUG
                bool is_first = true;
                while (!stop && socket.getline(buf, BUFSIZ)) {
 #ifdef DEBUG

-                       cerr << __FILE__ << "  Recibiendo inea: " << buf << endl;
+                       cerr << __FILE__ << "(" << __LINE__ << ")"
+                       << "  Recibiendo inea: " << buf << endl;

 #endif // DEBUG
                        int len = strlen(buf);
                        // Si tiene un retorno de carro, lo elimina.
 #endif // DEBUG
                        int len = strlen(buf);
                        // Si tiene un retorno de carro, lo elimina.


@@ -119,7 +131,8 @@ void ControlServer::real_run(void) {
                }
 */
 #ifdef DEBUG
                }
 */
 #ifdef DEBUG

-               cerr << __FILE__ << " : real_run() Despachando comando: target = "
+               cerr << __FILE__ << "(" << __LINE__ << ")"
+                       << " : real_run() Despachando comando: target = "

                        << command.get_target() << " | command = " << command.get_command()
                        << " | args = [" << String::join(command.get_args(), ", ") << "]"
                        << endl;
                        << command.get_target() << " | command = " << command.get_command()
                        << " | args = [" << String::join(command.get_args(), ", ") << "]"
                        << endl;


@@ -129,11 +142,12 @@ 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

-       cerr << __FILE__ << ": send() Enviado!" << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": send() Enviado!" << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }