X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/2f5c973fdf3f7fb25b13996b66d566c58066f6a0..e4f66a8221e3f2156d89a7a358073863503b2564:/Server/src/controlserver.cpp?ds=inline diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp index c5e163f..23f89c4 100644 --- a/Server/src/controlserver.cpp +++ b/Server/src/controlserver.cpp @@ -27,10 +27,12 @@ #include "plaqui/server/controlserver.h" #include "plaqui/server/command.h" -#include "plaqui/server/string.h" -#include -#include +#include "plaqui/server/httperror.h" +#include "plaqui/server/httpresponse.h" +//#include +//#include #ifdef DEBUG +# include "plaqui/server/string.h" # include #endif // DEBUG @@ -61,21 +63,27 @@ void ControlServer::real_run(void) { while (!stop) { Command command; try { + //Glib::Mutex::Lock lock(socket_mutex); socket >> command; - } catch (const char* e) { - cerr << " (" << __LINE__ << ") Error: " << e << endl; + // Si se cerró el socket. + } catch (const ios::failure& e) { stop = true; continue; - } catch (string e) { - cerr << " (" << __LINE__ << ") Error: " << e << endl; - stop = true; - continue; - } catch (...) { - cerr << " (" << __LINE__ << ") Error desconocido!" << endl; - stop = true; + // 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; @@ -110,73 +118,25 @@ void ControlServer::real_run(void) { } } */ - // Manda el comando. - command_received.emit(command); #ifdef DEBUG - cerr << "Comando: target = " << command.get_target() - << " | command = " << command.get_command() + cerr << __FILE__ << " : real_run() Despachando 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" << 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 << "
  • 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 << 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; + // Manda el comando. + command_received(command); } } +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; }