X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/65bf2eef7ac487329a3af3cd1c06e7957afc3a6c..d53ded00c10a30a17c7f0aad90acca933a7f4db9:/Server/src/controlserver.cpp diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp index c9007c5..32d3306 100644 --- a/Server/src/controlserver.cpp +++ b/Server/src/controlserver.cpp @@ -25,10 +25,172 @@ // $Id$ // -#include "controlserver.h" +#include "plaqui/server/controlserver.h" +#include "plaqui/server/command.h" +#include "plaqui/server/httperror.h" +#include "plaqui/server/httpresponse.h" +//#include +//#include +#ifdef DEBUG +# include "plaqui/server/string.h" +# include +#endif // DEBUG -using namespace Plaqui; +using namespace std; -//ControlServer::ControlServer(const iosockinet& socket) { -//} +namespace PlaQui { + +namespace Server { + +ControlServer::~ControlServer(void) { +#ifdef DEBUG + cerr << __FILE__ << ": destructor." << endl; +#endif // DEBUG +} + +ControlServer::ControlServer(const sockbuf::sockdesc& sd): + Connection(sd) { +#ifdef DEBUG + cerr << __FILE__ << ": sd = " << sd.sock << endl; +#endif // DEBUG +} + +void ControlServer::real_run(void) { +#ifdef DEBUG + cerr << __FILE__ << ": real_run()" << endl; +#endif // DEBUG + //char buf[BUFSIZ]; + while (!stop) { + Command command; + try { + //Glib::Mutex::Lock lock(socket_mutex); + socket >> command; + // Si se cerró el socket. + } catch (const ios::failure& e) { + stop = true; + continue; + // Si hay un error al parsear el comando, se envia una respuesta con el + // error. + } catch (const HTTPError& e) { +#ifdef DEBUG + cerr << __FILE__ << " : real_run() ERROR: status_code = " + << e.code << " | reason = " << HTTPMessage::reason(e.code) + << " | desc = " << e.what() << endl; +#endif // DEBUG + //Glib::Mutex::Lock lock(socket_mutex); + socket << HTTPResponse(e) << flush; + continue; + } + // TODO agregar las verificaciones de abajo a HTTPRequest y padres. + // Actualizacion: Estoy usando trim() en casi todos lados, no debería + // ser necesario. +/* + // Primera línea no vacía (que debe ser el request). + bool is_first = true; + while (!stop && socket.getline(buf, BUFSIZ)) { +#ifdef DEBUG + cerr << __FILE__ << " Recibiendo inea: " << buf << 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. + } + } +*/ +#ifdef DEBUG + cerr << __FILE__ << " : 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); + // 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" << 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 +Accept-Ranges: bytes +*/ +/* + socket << "Content-Type: text/html; charset=iso-8859-1" << endl; + response_xml << "" << endl; + response_xml << " " << endl; + response_xml << " PlaQui v0.4" << endl; + response_xml << " " << endl; + response_xml << " " << endl; + response_xml << "

PlaQui

" << endl; + response_xml << "

versión 0.4

" << endl; + response_xml << "

Comando

" << endl; + response_xml << "
    " << endl; + response_xml << "
  • Target: " << command.get_target() << endl; + response_xml << "
  • Command: " << command.get_command() << endl; + response_xml << "
  • Argumentos:" << endl; + response_xml << "
      " << endl; + for (Command::Arguments::const_iterator i = command.get_args().begin(); + i != command.get_args().end(); i++) { + response_xml << "
    1. " << *i << "
      2. " << endl; + } + response_xml << "
    " << endl; + response_xml << "
" << endl; + response_xml << "

Desarrollado por

" << endl; + response_xml << "
    " << endl; + response_xml << "
  • Nicolás Dimov.
    • " << endl; + response_xml << "
  • Leandro Lucarella.
    • " << endl; + response_xml << "
  • Ricardo Markiewicz.
    • " << endl; + response_xml << "
" << 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; +*/ + } +} + +void ControlServer::send(const HTTPResponse& response) { + //Glib::Mutex::Lock lock(socket_mutex); + socket << response << flush; +#ifdef DEBUG + cerr << __FILE__ << ": send() Enviado!" << endl; +#endif // DEBUG +} + +ControlServer::SignalCommandReceived& ControlServer::signal_command_received(void) { + return command_received; +} + +} // namespace Server + +} // namespace PlaQui