X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/43203fc1132e402ab5751167ed64196f10f5dedf..2f5c973fdf3f7fb25b13996b66d566c58066f6a0:/Server/src/controlserver.cpp?ds=sidebyside diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp index 544483f..c5e163f 100644 --- a/Server/src/controlserver.cpp +++ b/Server/src/controlserver.cpp @@ -26,37 +26,62 @@ // #include "plaqui/server/controlserver.h" -#include "plaqui/server/request.h" +#include "plaqui/server/command.h" +#include "plaqui/server/string.h" #include #include #ifdef DEBUG # include #endif // DEBUG -PlaQui::Server::ControlServer::~ControlServer(void) { +using namespace std; + +namespace PlaQui { + +namespace Server { + +ControlServer::~ControlServer(void) { #ifdef DEBUG - std::cerr << __FILE__ << ": destructor." << std::endl; + cerr << __FILE__ << ": destructor." << endl; #endif // DEBUG } -PlaQui::Server::ControlServer::ControlServer(const sockbuf::sockdesc& sd): +ControlServer::ControlServer(const sockbuf::sockdesc& sd): Connection(sd) { #ifdef DEBUG - std::cerr << __FILE__ << ": sd = " << sd.sock << std::endl; + cerr << __FILE__ << ": sd = " << sd.sock << endl; #endif // DEBUG } -void PlaQui::Server::ControlServer::real_run(void) { - // FIXME se tiene que ir a la clase para poder frenarlo desde afuera. - bool stop = false; - char buf[BUFFER_SIZE]; +void ControlServer::real_run(void) { +#ifdef DEBUG + cerr << __FILE__ << ": real_run()" << endl; +#endif // DEBUG + //char buf[BUFSIZ]; while (!stop) { - Request request; + Command command; + try { + socket >> command; + } catch (const char* e) { + cerr << " (" << __LINE__ << ") Error: " << e << endl; + stop = true; + continue; + } catch (string e) { + cerr << " (" << __LINE__ << ") Error: " << e << endl; + stop = true; + continue; + } catch (...) { + cerr << " (" << __LINE__ << ") Error desconocido!" << endl; + stop = true; + continue; + } + // TODO agregar las verificaciones de abajo a HTTPRequest y padres. +/* // Primera línea no vacía (que debe ser el request). bool is_first = true; - while (!stop && socket.getline(buf, BUFFER_SIZE)) { + while (!stop && socket.getline(buf, BUFSIZ)) { #ifdef DEBUG - std::cerr << "Reciviendo linea: " << buf << std::endl; + cerr << __FILE__ << " Recibiendo inea: " << buf << endl; #endif // DEBUG int len = strlen(buf); // Si tiene un retorno de carro, lo elimina. @@ -84,57 +109,79 @@ void PlaQui::Server::ControlServer::real_run(void) { // Si es la primera, no pasa nada, sigue esperando un request. } } - // TODO: Manda mensaje a la planta. - //signal_command_received().emit(request); - //dispatch_command(parse_command(sstr.str())); +*/ + // Manda el comando. + command_received.emit(command); #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 << "Comando: target = " << command.get_target() + << " | command = " << command.get_command() + << " | args = [" << String::join(command.get_args(), ", ") << "]" + << endl; #endif // DEBUG // FIXME - hacer respuesta XML. + // La respuesta hay que mandarla asincrónicamente porque no puedo + // responder hasta que la planta no se termine de actualizar, por + // ejemplo. stringstream response_xml; - socket << "HTTP/1.0 200 OK" << std::endl; + socket << "HTTP/1.0 200 OK" << 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 << "

PlaQui v0.4

PlaQui

versión 0.4

Comando

Versión: " << request.version << endl; + response_xml << "
Método: " << (request.method ? "POST" : "GET") << endl; + response_xml << "
URI: " << request.uri << endl; + response_xml << "
Query: " << request.query << endl; + for (HTTPHeaders::const_iterator i = request.headers.begin(); + i != request.headers.end(); i++) { response_xml << "
" << i->first << ": " - << i->second << std::endl; + << i->second << endl; + }*/ + response_xml << "
Target: " << command.get_target() << endl; + response_xml << "
Command: " << command.get_command() << endl; + response_xml << "
Argumentos:" << endl; + response_xml << "
1. " << *i << "

Desarrollado por

Nicolás Dimov.
Leandro Lucarella.
Ricardo Markiewicz.

" << std::endl; - response_xml << " Copyleft 2003 - bajo los " << std::endl; - response_xml << " términos de la licencia GPL" << std::endl; - response_xml << "

" << endl; + response_xml << "

Desarrollado por

" << endl; + response_xml << "

Nicolás Dimov.
Leandro Lucarella.
Ricardo Markiewicz.

" << endl; + response_xml << "

" << endl; + response_xml << " Copyleft 2003 - bajo los " << endl; + response_xml << " términos de la licencia GPL" << endl; + response_xml << "

" << endl; + response_xml << " " << endl; + response_xml << "" << endl; + socket << "Content-Length: " << response_xml.str().length() << endl; + socket << endl; + socket << response_xml.str() << flush; } } +ControlServer::SignalCommandReceived& ControlServer::signal_command_received(void) { + return command_received; +} + +} // namespace Server + +} // namespace PlaQui +