X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/802f79cdb0d688127b8a639cd3173d801a1466cd..1219cbffa9b305ac8ed53e2bb333443ea3bb1a75:/Server/src/controlserver.cpp?ds=sidebyside diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp index 8789af1..966e362 100644 --- a/Server/src/controlserver.cpp +++ b/Server/src/controlserver.cpp @@ -26,108 +26,88 @@ // #include "plaqui/server/controlserver.h" -#include "plaqui/server/request.h" -#include -#include +#include "plaqui/server/command.h" +#include "plaqui/server/httperror.h" +#include "plaqui/server/httpresponse.h" +#ifdef DEBUG +# include "plaqui/server/string.h" +# include +#endif // DEBUG + +using namespace std; + +namespace PlaQui { + +namespace Server { -using namespace PlaQui::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) { - Request request; - // Primera línea no vacía (que debe ser el request). - bool is_first = true; - while (!stop && socket.getline(buf, BUFFER_SIZE)) { +void ControlServer::real_run(void) throw() { #ifdef DEBUG - std::cerr << "Reciviendo linea: " << 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'; - } - // 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 { - // 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())); + 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 << "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() ERROR: status_code = " + << e.code << " | reason = " << HTTPMessage::reason(e.code) + << " | desc = " << e.what() << 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 << "" << 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 << "

" << i->first << ": " - << i->second << std::endl; + socket << HTTPResponse(e) << flush; + continue; } - response_xml << "

" << std::endl; - response_xml << "

Desarrollado por

" << std::endl; - response_xml << "

Nicolás Dimov.
Leandro Lucarella.
Ricardo Markiewicz.

" << 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; +#ifdef DEBUG + cerr << __FILE__ << "(" << __LINE__ << ")" + << " : real_run() Despachando comando: target = " + << command.get_target() << " | command = " << command.get_command() + << " | args = [" << String::join(command.get_args(), ", ") << "]" + << endl; +#endif // DEBUG + // 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 +