From: Leandro Lucarella Date: Sat, 8 Nov 2003 01:13:21 +0000 (+0000) Subject: Ya anda de nuevo el server. Compila y anda tan (in?)estable como antes, aunque tiene... X-Git-Tag: svn_import~330 X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/commitdiff_plain/df4733677cb16642b53628d22e4d927aadad8b27?ds=inline Ya anda de nuevo el server. Compila y anda tan (in?)estable como antes, aunque tiene muchas chanchadas... :-/ --- diff --git a/Server/include/plaqui/server/httpmessage.h b/Server/include/plaqui/server/httpmessage.h index b188e19..938f9ad 100644 --- a/Server/include/plaqui/server/httpmessage.h +++ b/Server/include/plaqui/server/httpmessage.h @@ -45,13 +45,13 @@ namespace Server { /// Cuerpo del mensaje. std::string body; - protected: + protected: // TODO hacer privados con get() y set() ??? + + public: /// Version HTTP. std::string version; - public: - /// Cabeceras HTTP. HTTPHeaders headers; diff --git a/Server/include/plaqui/server/httprequest.h b/Server/include/plaqui/server/httprequest.h index 92c6de7..44b45a9 100644 --- a/Server/include/plaqui/server/httprequest.h +++ b/Server/include/plaqui/server/httprequest.h @@ -78,9 +78,12 @@ namespace Server { // Atributos. - protected: + protected: // TODO hacer privados con get() y set() ??? + + public: /// Método HTTP. + /// @todo TODO - convertirlo a string? Hace todo más fácil (y más ineficiente :) HTTPMethod method; /// URI. diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp index 144d236..5d67502 100644 --- a/Server/src/controlserver.cpp +++ b/Server/src/controlserver.cpp @@ -59,7 +59,21 @@ void ControlServer::real_run(void) { //char buf[BUFSIZ]; while (!stop) { HTTPRequest request; - socket >> request; + try { + socket >> request; + } catch (const char* e) { + cerr << "Error: " << e << endl; + stop = true; + continue; + } catch (string e) { + cerr << "Error: " << e << endl; + stop = true; + continue; + } catch (...) { + cerr << "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). @@ -124,9 +138,13 @@ Accept-Ranges: bytes response_xml << " " << endl; response_xml << " " << endl; response_xml << "

PlaQui

" << endl; - response_xml << "

versión 0.2

" << endl; + response_xml << "

versión 0.3

" << endl; response_xml << "

Pedido HTTP

" << 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 << ": " diff --git a/Server/src/httpheaders.cpp b/Server/src/httpheaders.cpp index 8ebb3a7..65d5adc 100644 --- a/Server/src/httpheaders.cpp +++ b/Server/src/httpheaders.cpp @@ -54,9 +54,13 @@ istream& operator>>(istream& is, HTTPHeaders& h) { string::size_type pos = sbuf.find(":"); if (pos == string::npos) { // FIXME poner mejores excepciones. - throw "Wrong header"; + throw string("Wrong header: ") + sbuf; } h[sbuf.substr(0, pos)] = String(sbuf.substr(pos + 1)).trim(); +#ifdef DEBUG + cerr << __FILE__ << " " << sbuf.substr(0, pos) << " = " + << h[sbuf.substr(0, pos)] << endl; +#endif // DEBUG return is; } diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp index 685fa69..cfdd894 100644 --- a/Server/src/httpmessage.cpp +++ b/Server/src/httpmessage.cpp @@ -25,6 +25,7 @@ // $Id$ // +#include "plaqui/server/string.h" #include "plaqui/server/httpmessage.h" #include #include @@ -82,27 +83,36 @@ istream& operator>>(istream& is, HTTPMessage& m) { #endif // DEBUG char buf[BUFSIZ]; bool is_header = true; - stringstream body_ss; + // TODO body + // Para hacer que reciba bien el body hay que chequear la cabecera + // Content-length, si queda tiempo lo haré... + //stringstream body_ss; while (is.getline(buf, BUFSIZ)) { - string sbuf = buf; + String sbuf(buf); + sbuf.trim(); if (sbuf.length()) { if (is_header) { stringstream ss; - ss << buf; + ss << sbuf; ss >> m.headers; - } else { - body_ss << buf << endl; - } + }// else { TODO body + // body_ss << sbuf << endl; + //} } else { if (is_header) { + // TODO body + // Ver si tiene un Content-Length para saber si esperamos body. + // Si no esperamos body, no hay que hacer otro is.getline() + // porque se queda esperando forever. is_header = false; - } else { - body_ss << buf << endl; - } + break; + }// else { TODO body + // body_ss << sbuf << endl; + //} } } - // TODO si el body es un serializable, deberia auto deserializarse. - m.body = body_ss.str(); + // TODO body + //m.body = body_ss.str(); return is; } diff --git a/Server/tests/server_test.cpp b/Server/tests/server_test.cpp index 1927af4..f9989b5 100644 --- a/Server/tests/server_test.cpp +++ b/Server/tests/server_test.cpp @@ -56,9 +56,17 @@ int main(int argc, char* argv[]) { // Inicializa threads. Glib::thread_init(); + try { // Corre el server. Server server(port); server.run(false); + } catch (const char* e) { + cerr << "Error: " << e << endl; + } catch (exception e) { + cerr << "Error: " << e.what() << endl; + } catch (...) { + cerr << "Error desconocido!" << endl; + } return 0; }