X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/ffe5447aa2d71b5296cbdd36c48d5f9d59e249af..d53ded00c10a30a17c7f0aad90acca933a7f4db9:/Server/src/controlserver.cpp diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp index 133f36e..32d3306 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 @@ -47,7 +49,7 @@ ControlServer::~ControlServer(void) { } ControlServer::ControlServer(const sockbuf::sockdesc& sd): - ServerConnection(sd) { + Connection(sd) { #ifdef DEBUG cerr << __FILE__ << ": sd = " << sd.sock << endl; #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,50 +118,37 @@ void ControlServer::real_run(void) { } } */ - // TODO: Manda el comando. - // Command command = parse_command(request.uri); - //signal_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; - //for (HTTPRequest::const_iterator i = request.begin(); - // i != request.end(); i++) { - // cerr << " " << i->first << ": " << i->second << 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; + //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.1" << 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 << "

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; @@ -179,9 +174,22 @@ Accept-Ranges: bytes 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