- Se agregan 2 nuevas clases para parsear los request HTTP: String y Request.

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

diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp
index 4b888493b2264666c733dc3dfc7bdf8242ec18e5..69de3a7c69612936d1b745bdd31881d62038746c 100644 (file)
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -25,7 +25,8 @@
 // $Id$
 //
 
 // $Id$
 //
 

-#include "controlserver.h"
+#include "plaqui/server/controlserver.h"
+#include "plaqui/server/request.h"

 #include <cstring>
 #include <sstream>
 
 #include <cstring>
 #include <sstream>
 


@@ -34,6 +35,7 @@ using namespace Plaqui;
 ControlServer::ControlServer(const sockbuf::sockdesc& sd):
                Connection(sd) {
 #ifdef 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;
 #endif // DEBUG
 }
        std::cerr << __FILE__ << ": sd = " << sd.sock << std::endl;
 #endif // DEBUG
 }


@@ -43,26 +45,96 @@ void ControlServer::real_run(void) {
        bool stop = false;
        char buf[BUFFER_SIZE];
        while (!stop) {
        bool stop = false;
        char buf[BUFFER_SIZE];
        while (!stop) {

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

                while (!stop && socket.getline(buf, BUFFER_SIZE)) {
 #ifdef DEBUG
                while (!stop && socket.getline(buf, BUFFER_SIZE)) {
 #ifdef DEBUG

-                       std::cerr << "Reciviendo: " << buf << std::endl;
+                       std::cerr << "Reciviendo (crudo): " << buf << std::endl;

 #endif // DEBUG
 #endif // DEBUG

-                       // Si tiene contenido, lo almaceno en el buffer de comandos.
-                       if (strlen(buf)) {
-                               sstr << buf << endl;
-                       // Si viene la línea vacía, terminan las cabeceras HTTP.
+                       int len = strlen(buf);
+                       // Si tiene un retorno de carro, lo elimina.
+                       if (len && (buf[len-1] == '\r')) {
+                               buf[--len] = '\0';
+                       }
+#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;
+                       }
+#endif // DEBUG
+                       // Si tiene contenido, lo agrego a la información del request.
+                       if (len) {
+                               // Si es la primera línea, es el request.
+                               if (is_first) {
+                                       request.set_request(buf, socket->peerhost(),
+                                                       socket->peerport());
+                                       is_first = false;
+                               } else {
+                                       // TODO request.parse_header(buf);
+                               }
+                       // Si viene la línea vacía

                        } else {
                        } else {

-                               stop = true;
+                               // Si no es la primera, terminan las cabeceras HTTP.
+                               if (!is_first) {
+                                       // Podría ir un break.
+                                       stop = true;
+                                       continue;
+                               }
+                               // Si es la primera, no pasa nada, sigue esperando un request.

                        }
                }
                // Manda mensaje a la planta.
                //dispatch_command(parse_command(sstr.str()));
 #ifdef DEBUG
                        }
                }
                // Manda mensaje a la planta.
                //dispatch_command(parse_command(sstr.str()));
 #ifdef DEBUG

-                       std::cerr << "Recivido:" << std::endl << sstr.str() << std::endl;
+               std::cerr << "Request: " << std::endl;
+               for (Request::const_iterator i = request.begin(); i != request.end();
+                               i++) {
+                       std::cerr << "   " << i->first << ": " << i->second << std::endl;
+               }

 #endif // DEBUG
                // FIXME - hacer respuesta XML.
 #endif // DEBUG
                // FIXME - hacer respuesta XML.

-               socket << "Ok!" << std::endl;
+               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;

        }
 }
 
        }
 }