Se arregla el bug que hacia que se cuelgue el cliente al desconectarse.

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

diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp
index 0587bc17f052d0d69e9cfdaf79b1aae9b108ce4a..a9cf729fd091c1662b6733c0a0b3b4cb47d914ee 100644 (file)
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -26,37 +26,82 @@
 //
 
 #include "plaqui/server/controlserver.h"
 //
 
 #include "plaqui/server/controlserver.h"

-#include "plaqui/server/request.h"
-#include <cstring>
-#include <sstream>
+#include "plaqui/server/command.h"
+#include "plaqui/server/httperror.h"
+#include "plaqui/server/httpresponse.h"
+//#include <cstring>
+//#include <sstream>

 #ifdef DEBUG
 #ifdef DEBUG

+#      include "plaqui/server/string.h"

 #      include <iostream>
 #endif // DEBUG
 
 #      include <iostream>
 #endif // DEBUG
 

-PlaQui::Server::ControlServer::~ControlServer(void) {
+using namespace std;
+
+namespace PlaQui {
+
+namespace Server {
+
+ControlServer::~ControlServer(void) {

 #ifdef DEBUG
 #ifdef DEBUG

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

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

-PlaQui::Server::ControlServer::ControlServer(const sockbuf::sockdesc& sd):
-               ServerConnection(sd) {
+ControlServer::ControlServer(const sockbuf::sockdesc& sd):
+               Connection(sd) {

 #ifdef DEBUG
 #ifdef DEBUG

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

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

-void PlaQui::Server::ControlServer::real_run(void) {
-       // FIXME se tiene que ir a la clase para poder frenarlo desde afuera.
-       bool stop = false;
-       char buf[BUFFER_SIZE];
+void ControlServer::real_run(void) {
+#ifdef DEBUG
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": real_run()" << endl;
+#endif // DEBUG
+       //char buf[BUFSIZ];

        while (!stop) {
        while (!stop) {

-               Request request;
+               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ó.");
+                       return;
+               } catch (const sockerr& e) {
+                       error(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
+                       cerr << __FILE__ << "(" << __LINE__ << ")"
+                               << " : real_run() ERROR: status_code = "
+                               << e.code << " | reason = " << HTTPMessage::reason(e.code)
+                               << " | desc = " << e.what() << endl;
+#endif // DEBUG
+                       //Glib::Mutex::Lock lock(socket_mutex);
+                       socket << HTTPResponse(e) << flush;
+                       continue;
+               }
+               // TODO agregar las verificaciones de abajo a HTTPRequest y padres.
+               // Actualizacion: Estoy usando trim() en casi todos lados, no debería
+               // ser necesario.
+/*

                // Primera línea no vacía (que debe ser el request).
                bool is_first = true;
                // Primera línea no vacía (que debe ser el request).
                bool is_first = true;

-               while (!stop && socket.getline(buf, BUFFER_SIZE)) {
+               while (!stop && socket.getline(buf, BUFSIZ)) {

 #ifdef DEBUG
 #ifdef DEBUG

-                       std::cerr << "Recibiendo linea: " << buf << std::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.


@@ -84,57 +129,33 @@ void PlaQui::Server::ControlServer::real_run(void) {
                                // Si es la primera, no pasa nada, sigue esperando un request.
                        }
                }
                                // Si es la primera, no pasa nada, sigue esperando un request.
                        }
                }

-               // TODO: Manda mensaje a la planta.
-               //signal_command_received().emit(request);
-               //dispatch_command(parse_command(sstr.str()));
+*/

 #ifdef DEBUG
 #ifdef DEBUG

-               std::cerr << "Request: " << std::endl;
-               for (Request::const_iterator i = request.begin(); i != request.end();
-                               i++) {
-                       std::cerr << "   " << i->first << ": " << i->second << std::endl;
-               }
+               cerr << __FILE__ << "(" << __LINE__ << ")"
+                       << " : real_run() Despachando comando: target = "
+                       << command.get_target() << " | command = " << command.get_command()
+                       << " | args = [" << String::join(command.get_args(), ", ") << "]"
+                       << endl;

 #endif // DEBUG
 #endif // DEBUG

-               // FIXME - hacer respuesta XML.
-               stringstream response_xml;
-               socket << "HTTP/1.0 200 OK" << std::endl;
-/*
-Date: Sun, 19 Oct 2003 15:11:14 GMT
-Server: Apache/1.3.28 (Debian GNU/Linux)
-Last-Modified: Mon, 28 Apr 2003 07:50:08 GMT
-ETag: "110f4043-11a1-3eacdd30"
-Accept-Ranges: bytes
-*/
-               socket << "Content-Type: text/html; charset=iso-8859-1" << std::endl;
-               response_xml << "<html>" << std::endl;
-               response_xml << "    <head>" << std::endl;
-               response_xml << "        <title>PlaQui v0.1</title>" << std::endl;
-               response_xml << "    </head>" << std::endl;
-               response_xml << "    <body>" << std::endl;
-               response_xml << "        <h1>PlaQui</h1>" << std::endl;
-               response_xml << "        <p>versión 0.2</p>" << std::endl;
-               response_xml << "        <h2>Pedido HTTP</h2>" << std::endl;
-               response_xml << "        <ul>" << std::endl;
-               for (Request::const_iterator i = request.begin(); i != request.end();
-                               i++) {
-                       response_xml << "           <li><b>" << i->first << ":</b> "
-                               << i->second << std::endl;
-               }
-               response_xml << "        </ul>" << std::endl;
-               response_xml << "        <h2>Desarrollado por</h2>" << std::endl;
-               response_xml << "        <ul>" << std::endl;
-               response_xml << "            <li>Nicolás Dimov.</li>" << std::endl;
-               response_xml << "            <li>Leandro Lucarella.</li>" << std::endl;
-               response_xml << "            <li>Ricardo Markiewicz.</li>" << std::endl;
-               response_xml << "        </ul>" << std::endl;
-               response_xml << "        <address>" << std::endl;
-               response_xml << "             Copyleft 2003 - bajo los " << std::endl;
-               response_xml << "             términos de la licencia GPL" << std::endl;
-               response_xml << "        </address>" << std::endl;
-               response_xml << "    </body>" << std::endl;
-               response_xml << "</html>" << std::endl;
-               socket << "Content-Length: " << response_xml.str().length() << std::endl;
-               socket << std::endl;
-               socket << response_xml.str() << std::flush;
+               // Manda el comando.
+               command_received(command);

        }
 }
 
        }
 }
 

+void ControlServer::send(const HTTPResponse& response) {
+       //Glib::Mutex::Lock lock(socket_mutex);
+       socket << response << flush;
+#ifdef DEBUG
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": send() Enviado!" << endl;
+#endif // DEBUG
+}
+
+ControlServer::SignalCommandReceived& ControlServer::signal_command_received(void) {
+       return command_received;
+}
+
+} // namespace Server
+
+} // namespace PlaQui
+