Mas msg lindos

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

diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp
index 6ac3a77fcb73c71094f3783e302f1e48eee8e5de..966e362aa96ced609d070f65a36f2a463d993786 100644 (file)
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -25,88 +25,89 @@
 // $Id$
 //
 
-#include "controlserver.h"
-#include <cstring>
-#include <sstream>
+#include "plaqui/server/controlserver.h"
+#include "plaqui/server/command.h"
+#include "plaqui/server/httperror.h"
+#include "plaqui/server/httpresponse.h"
+#ifdef DEBUG
+#      include "plaqui/server/string.h"
+#      include <iostream>
+#endif // DEBUG
+
+using namespace std;
+
+namespace PlaQui {
 
-using namespace Plaqui;
+namespace Server {
+
+ControlServer::~ControlServer(void) {
+#ifdef DEBUG
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": destructor." << endl;
+#endif // DEBUG
+}
 
 ControlServer::ControlServer(const sockbuf::sockdesc& sd):
                Connection(sd) {
 #ifdef DEBUG
-       std::cerr << "Compilado el " << __DATE__ << std::endl;
-       std::cerr << __FILE__ << ": sd = " << sd.sock << std::endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": sd = " << sd.sock << endl;
 #endif // DEBUG
 }
 
-void ControlServer::real_run(void) {
-       // FIXME se tiene que ir a la clase para poder frenarlo desde afuera.
-       bool stop = false;
-       char buf[BUFFER_SIZE];
-       while (!stop) {
-               stringstream sstr;
-               while (!stop && socket.getline(buf, BUFFER_SIZE)) {
+void ControlServer::real_run(void) throw() {
 #ifdef DEBUG
-                       std::cerr << "Reciviendo (crudo): " << buf << std::endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": real_run()" << endl;
 #endif // DEBUG
-                       int len = strlen(buf);
-                       // Si tiene un retorno de carro, lo elimina.
-                       if (len && (buf[len-1] == '\r')) {
-                               buf[--len] = '\0';
-                       }
+       while (!stop()) {
+               Command command;
+               try {
+                       socket >> command;
+               } catch (const ios::failure& e) {
+                       // TODO poner buenos codigos de error.
+                       signal_error().emit(200000, "Se desconectó.");
+                       return;
+               } catch (const sockerr& e) {
+                       signal_error().emit(e.serrno(), e.errstr());
+                       return;
+               // Si hay un error al parsear el comando, se envia una respuesta con el
+               // error.
+               } catch (const HTTPError& e) {
 #ifdef DEBUG
-                       std::cerr << "Reciviendo (sin \\r): " << buf << std::endl;
-                       std::cerr << "len: " << len << std::endl;
-                       if (len == 1) {
-                               std::cerr << std::hex << "Caracter: " << *buf << std::endl;
-                       }
+                       cerr << __FILE__ << "(" << __LINE__ << ")"
+                               << " : real_run() ERROR: status_code = "
+                               << e.code << " | reason = " << HTTPMessage::reason(e.code)
+                               << " | desc = " << e.what() << endl;
 #endif // DEBUG
-                       // Si tiene contenido, lo almaceno en el buffer de comandos.
-                       if (len) {
-                               sstr << buf << endl;
-                       // Si viene la línea vacía, terminan las cabeceras HTTP.
-                       } else {
-                               stop = true;
-                       }
+                       socket << HTTPResponse(e) << flush;
+                       continue;
                }
-               // Manda mensaje a la planta.
-               //dispatch_command(parse_command(sstr.str()));
 #ifdef DEBUG
-               std::cerr << "Recivido:" << std::endl << sstr.str() << 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
-               // 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.1</p>" << std::endl;
-               response_xml << "        <h3>Desarrollado por</h3>" << 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 Response& response) {
+       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
+