X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/a9cb053146d2f1dc73e536ed87597f458deebea3..6e0194f46ac77c18bfeabf84ef94a32f23e41073:/Server/src/controlserver.cpp?ds=sidebyside diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp index 4b88849..69de3a7 100644 --- a/Server/src/controlserver.cpp +++ b/Server/src/controlserver.cpp @@ -25,7 +25,8 @@ // $Id$ // -#include "controlserver.h" +#include "plaqui/server/controlserver.h" +#include "plaqui/server/request.h" #include #include @@ -34,6 +35,7 @@ using namespace Plaqui; 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 } @@ -43,26 +45,96 @@ void ControlServer::real_run(void) { 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 - std::cerr << "Reciviendo: " << buf << std::endl; + std::cerr << "Reciviendo (crudo): " << buf << std::endl; #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 { - 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 - 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. - 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 << "" << std::endl; + response_xml << " " << std::endl; + response_xml << " PlaQui v0.1" << std::endl; + response_xml << " " << std::endl; + response_xml << " " << std::endl; + response_xml << "

PlaQui

" << std::endl; + response_xml << "

versión 0.2

" << std::endl; + response_xml << "

Pedido HTTP

" << std::endl; + response_xml << " " << std::endl; + response_xml << "

Desarrollado por

" << std::endl; + response_xml << " " << std::endl; + response_xml << "
" << std::endl; + response_xml << " Copyleft 2003 - bajo los " << std::endl; + response_xml << " términos de la licencia GPL" << std::endl; + response_xml << "
" << std::endl; + response_xml << " " << std::endl; + response_xml << "" << std::endl; + socket << "Content-Length: " << response_xml.str().length() << std::endl; + socket << std::endl; + socket << response_xml.str() << std::flush; } }