From 1eadf77f99288a079f330d14feb6e81dac906cd3 Mon Sep 17 00:00:00 2001 From: Leandro Lucarella Date: Sun, 19 Oct 2003 15:55:24 +0000 Subject: [PATCH] El server manda una respuesta HTTP valida (al parecer, al menos para Mozilla :). --- Server/src/Makefile | 1 + Server/src/controlserver.cpp | 52 +++++++++++++++++++++++++++++++++--- 2 files changed, 49 insertions(+), 4 deletions(-) diff --git a/Server/src/Makefile b/Server/src/Makefile index 569d18d..07f6901 100644 --- a/Server/src/Makefile +++ b/Server/src/Makefile @@ -71,6 +71,7 @@ objects+=server.o server.o: $(server_h) server.cpp server.a: $(objects) + rm -f $@ $(AR) cq $@ $(objects) clean: diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp index 4b88849..6ac3a77 100644 --- a/Server/src/controlserver.cpp +++ b/Server/src/controlserver.cpp @@ -34,6 +34,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 } @@ -46,10 +47,22 @@ void ControlServer::real_run(void) { stringstream sstr; while (!stop && socket.getline(buf, BUFFER_SIZE)) { #ifdef DEBUG - std::cerr << "Reciviendo: " << buf << std::endl; + std::cerr << "Reciviendo (crudo): " << buf << std::endl; +#endif // DEBUG + 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 almaceno en el buffer de comandos. - if (strlen(buf)) { + if (len) { sstr << buf << endl; // Si viene la línea vacía, terminan las cabeceras HTTP. } else { @@ -59,10 +72,41 @@ void ControlServer::real_run(void) { // Manda mensaje a la planta. //dispatch_command(parse_command(sstr.str())); #ifdef DEBUG - std::cerr << "Recivido:" << std::endl << sstr.str() << std::endl; + std::cerr << "Recivido:" << std::endl << sstr.str() << 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.1

" << 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; } } -- 2.43.0