Se agregan mas cosas nuevas, todavia no compila.

diff --git a/Server/include/plaqui/server/httpheaders.h b/Server/include/plaqui/server/httpheaders.h
index bc4ce02351f459c698038c7346b75ae15bcdeb1f..8eb42edae813e2deab63fd751c33931cab6a660b 100644 (file)
--- a/Server/include/plaqui/server/httpheaders.h
+++ b/Server/include/plaqui/server/httpheaders.h
@@ -48,8 +48,7 @@ namespace Server {
                        /**
                         * Obtiene los datos de las cabeceras HTTP desde un texto.
                         */
                        /**
                         * Obtiene los datos de las cabeceras HTTP desde un texto.
                         */

-                       friend std::istream& operator>>(std::istream& is,
-                                       const HTTPHeaders& h);
+                       friend std::istream& operator>>(std::istream& is, HTTPHeaders& h);

 
                        /**
                         * Convierte las cabeceras HTTP a texto.
 
                        /**
                         * Convierte las cabeceras HTTP a texto.

diff --git a/Server/include/plaqui/server/httpmessage.h b/Server/include/plaqui/server/httpmessage.h
index cd583e72064d3bfc6a864149dc4f6d921d23595a..888eacf1f7b70f0b2ccb0746d8247533b6987312 100644 (file)
--- a/Server/include/plaqui/server/httpmessage.h
+++ b/Server/include/plaqui/server/httpmessage.h
@@ -39,6 +39,11 @@ namespace Server {
 
                // Atributos.
 
 
                // Atributos.
 

+               private:
+
+                       /// Cuerpo del mensaje.
+                       std::string body;
+

                protected:
 
                        /// Version HTTP.
                protected:
 
                        /// Version HTTP.


@@ -47,9 +52,6 @@ namespace Server {
                        /// Cabeceras HTTP.
                        HTTPHeaders headers;
 
                        /// Cabeceras HTTP.
                        HTTPHeaders headers;
 

-                       /// Cuerpo del mensaje.
-                       std::string body;
-

                // Métodos.
 
                public:
                // Métodos.
 
                public:


@@ -67,14 +69,25 @@ namespace Server {
                        /**
                         * Constructor.
                         */
                        /**
                         * Constructor.
                         */

-                       HTTPMessage(const std::string& body,
-                                       const std::string& http_version = "1.1");
+                       //HTTPMessage(const std::string& body,
+                       //              const std::string& http_version = "1.1");
+
+                       /**
+                        * Obtiene el cuerpo del mensaje.
+                        */
+                       const std::string& get_body(void) const;
+
+                       /**
+                        * Establece el cuerpo del mensaje.
+                        *
+                        * \param _body Cuerpo del mensaje.
+                        */
+                       void set_body(const std::string& _body);

 
                        /**
                         * Obtiene los datos del pedido HTTP desde un texto.
                         */
 
                        /**
                         * Obtiene los datos del pedido HTTP desde un texto.
                         */

-                       friend std::istream& operator>>(std::istream& is,
-                                       const HTTPMessage& m);
+                       friend std::istream& operator>>(std::istream& is, HTTPMessage& m);

 
                        /**
                         * Convierte el pedido HTTP en texto.
 
                        /**
                         * Convierte el pedido HTTP en texto.

diff --git a/Server/include/plaqui/server/httprequest.h b/Server/include/plaqui/server/httprequest.h
index 0f2145268fe3fa16f52abe2c89b9bccf04f40d06..55748e718acd59eec453bb1c9ab6a5c53d73525f 100644 (file)
--- a/Server/include/plaqui/server/httprequest.h
+++ b/Server/include/plaqui/server/httprequest.h
@@ -109,8 +109,7 @@ namespace Server {
                        /**
                         * Obtiene los datos del pedido HTTP desde un texto.
                         */
                        /**
                         * Obtiene los datos del pedido HTTP desde un texto.
                         */

-                       friend std::istream& operator>>(std::istream& is,
-                                       const HTTPRequest& req);
+                       friend std::istream& operator>>(std::istream& is, HTTPRequest& req);

 
                        /**
                         * Convierte el pedido HTTP en texto.
 
                        /**
                         * Convierte el pedido HTTP en texto.

diff --git a/Server/include/plaqui/server/httpresponse.h b/Server/include/plaqui/server/httpresponse.h
index 936d2a35e0473d6e0b31c7f35f9a308d1a448ac8..f5c0afd81744a4053426b67a6780626cdab1241c 100644 (file)
--- a/Server/include/plaqui/server/httpresponse.h
+++ b/Server/include/plaqui/server/httpresponse.h
@@ -65,27 +65,27 @@ namespace Server {
                        /**
                         * Constructor.
                         */
                        /**
                         * Constructor.
                         */

-                       HTTPResponse(const Serializable& body,
-                                       const std::string& version = "1.1");
+                       //HTTPResponse(const std::string& body,
+                       //              const std::string& version = "1.1");

 
                        /**
                         * Constructor.
                         */
 
                        /**
                         * Constructor.
                         */

-                       HTTPResponse(unsigned status_code, const std::string& reason,
-                                       const std::string& version = "1.1");
+                       //HTTPResponse(unsigned status_code, const std::string& reason,
+                       //              const std::string& version = "1.1");

 
                        /**
                         * Constructor.
                         */
 
                        /**
                         * Constructor.
                         */

-                       HTTPResponse(unsigned status_code, const std::string& reason,
-                                       const std::string& body,
-                                       const std::string& version = "1.1");
+                       //HTTPResponse(unsigned status_code, const std::string& reason,
+                       //              const std::string& body,
+                       //              const std::string& version = "1.1");

 
                        /**
                         * Obtiene los datos de la respuesta HTTP desde un texto.
                         */
                        friend std::istream& operator>>(std::istream& is,
 
                        /**
                         * Obtiene los datos de la respuesta HTTP desde un texto.
                         */
                        friend std::istream& operator>>(std::istream& is,

-                                       const HTTPResponse& resp);
+                                       HTTPResponse& resp);

 
                        /**
                         * Convierte la respuesta HTTP en texto.
 
                        /**
                         * Convierte la respuesta HTTP en texto.

diff --git a/Server/src/httpheaders.cpp b/Server/src/httpheaders.cpp
index d0736b2a39aa5cf6a01ee4619873c54cbe504de3..67ec270a12c3cfa55f2e424305cb5d4c81135b83 100644 (file)
--- a/Server/src/httpheaders.cpp
+++ b/Server/src/httpheaders.cpp
@@ -36,64 +36,30 @@ PlaQui::Server::HTTPHeaders::~HTTPHeaders(void) {
        std::cerr << __FILE__ << ": destructor." << std::endl;
 #endif // DEBUG
 }
        std::cerr << __FILE__ << ": destructor." << std::endl;
 #endif // DEBUG
 }

-/*
-PlaQui::Server::HTTPMessage::HTTPMessage(const std::string& http_version):
-               http_version(http_version) {
-#ifdef DEBUG
-       std::cerr << __FILE__ << ": http_version = " << http_version << std::endl;
-#endif // DEBUG
-}

 
 

-PlaQui::Server::HTTPMessage::HTTPMessage(const std::string& _body,
-               const std::string& http_version):
-               http_version(http_version) {
+istream& operator>>(std::istream& is, PlaQui::Server::httpheaders& h) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": http_version = " << http_version
-               << " | body = " << body << std::endl;
+       std::cerr << __FILE__ << ": operator>>()" << std::endl;

 #endif // DEBUG
 #endif // DEBUG

-       set_body(_body);
+       char buf[BUFSIZ];
+       is.getline(buf, BUFSIZ);
+       std::string sbuf = buf;
+       std::string::size_type pos = sbuf.find(":");
+       if (pos == std::string::npos) {
+               // FIXME poner mejores excepciones.
+               throw "Wrong header";
+       }
+       (*this)[sbuf.substr(0, pos)] = sbuf.substr(pos + 1);
+       return is;

 }
 }

-*/
+

 ostream& operator<<(std::ostream& os, PlaQui::Server::HTTPMessage) {
 #ifdef DEBUG
        std::cerr << __FILE__ << ": operator<<()" << std::endl;
 #endif // DEBUG
        for (HTTPMessage::const_iterator i = begin(); i != end(); ++i) {
 ostream& operator<<(std::ostream& os, PlaQui::Server::HTTPMessage) {
 #ifdef DEBUG
        std::cerr << __FILE__ << ": operator<<()" << std::endl;
 #endif // DEBUG
        for (HTTPMessage::const_iterator i = begin(); i != end(); ++i) {

-               os << i->first << ": " << i->second << std::flush;
-       return os << headers << "\r\l" // Fin de cabeceras
-}
-
-istream& operator>>(std::istream& is, PlaQui::Server::HTTPMessage) {
-#ifdef DEBUG
-       std::cerr << __FILE__ << ": operator>>()" << std::endl;
-#endif // DEBUG
-       char buf[BUFSIZ];
-       bool is_header = true;
-       stringstream body_ss;
-       while (is.getline(buf, BUFSIZ)) {
-               std::string sbuf = buf;
-               if (sbuf.length())
-                       if (is_header) {
-                               // TODO esto va al operator>> de HTTPHeaders.
-                               std::string::size_type pos = sbuf.find(":");
-                               if (pos == std::string::npos) {
-                                       // FIXME poner mejores excepciones.
-                                       throw "Wrong header";
-                               }
-                               headers[sbuf.substr(0, pos)] = sbuf.substr(pos + 1);
-                       } else {
-                               body_ss << buf << std::endl;
-                       }
-               } else {
-                       if (is_header) {
-                               is_header = false;
-                       } else {
-                               body_ss << buf << std::endl;
-                       }
-               }
+               os << i->first << ": " << i->second << "\r\l";

        }
        }

-       // TODO El body debería leer solo el content-length.
-       body = body_ss.str();
-       return is;
+       return os;

 }
 
 }
 

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index 625d82e966d3dc0de14dab8317e475fd4481128e..2d3a18bca1f5bc09836efbdfc9058cad8b18431e 100644 (file)
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -44,6 +44,7 @@ PlaQui::Server::HTTPMessage::HTTPMessage(const std::string& http_version):
 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

+/*

 PlaQui::Server::HTTPMessage::HTTPMessage(const std::string& _body,
                const std::string& http_version):
                http_version(http_version) {
 PlaQui::Server::HTTPMessage::HTTPMessage(const std::string& _body,
                const std::string& http_version):
                http_version(http_version) {


@@ -53,6 +54,7 @@ PlaQui::Server::HTTPMessage::HTTPMessage(const std::string& _body,
 #endif // DEBUG
        set_body(_body);
 }
 #endif // DEBUG
        set_body(_body);
 }

+*/

 
 void PlaQui::Server::HTTPMessage::set_body(const std::string& _body) {
        body = _body;
 
 void PlaQui::Server::HTTPMessage::set_body(const std::string& _body) {
        body = _body;


@@ -67,14 +69,6 @@ const std::string& PlaQui::Server::HTTPMessage::get_body(void) {
        return body;
 }
 
        return body;
 }
 

-ostream& operator<<(std::ostream& os, PlaQui::Server::HTTPMessage) {
-#ifdef DEBUG
-       std::cerr << __FILE__ << ": operator<<()" << std::endl;
-#endif // DEBUG
-       return os << headers << "\r\l" // Fin de cabeceras
-               << body << std::flush;
-}
-

 istream& operator>>(std::istream& is, PlaQui::Server::HTTPMessage) {
 #ifdef DEBUG
        std::cerr << __FILE__ << ": operator>>()" << std::endl;
 istream& operator>>(std::istream& is, PlaQui::Server::HTTPMessage) {
 #ifdef DEBUG
        std::cerr << __FILE__ << ": operator>>()" << std::endl;


@@ -86,13 +80,7 @@ istream& operator>>(std::istream& is, PlaQui::Server::HTTPMessage) {
                std::string sbuf = buf;
                if (sbuf.length())
                        if (is_header) {
                std::string sbuf = buf;
                if (sbuf.length())
                        if (is_header) {

-                               // TODO esto va al operator>> de HTTPHeaders.
-                               std::string::size_type pos = sbuf.find(":");
-                               if (pos == std::string::npos) {
-                                       // FIXME poner mejores excepciones.
-                                       throw "Wrong header";
-                               }
-                               headers[sbuf.substr(0, pos)] = sbuf.substr(pos + 1);
+                               istringstream(buf) >> m.headers;

                        } else {
                                body_ss << buf << std::endl;
                        }
                        } else {
                                body_ss << buf << std::endl;
                        }


@@ -109,3 +97,11 @@ istream& operator>>(std::istream& is, PlaQui::Server::HTTPMessage) {
        return is;
 }
 
        return is;
 }
 

+ostream& operator<<(std::ostream& os, PlaQui::Server::HTTPMessage) {
+#ifdef DEBUG
+       std::cerr << __FILE__ << ": operator<<()" << std::endl;
+#endif // DEBUG
+       return os << headers << "\r\l" // Fin de cabeceras
+               << body;
+}
+

diff --git a/Server/src/httprequest.cpp b/Server/src/httprequest.cpp
index 4c28a51fba7fb084608b60b07fd3ff9b0a622ad8..36146105697b47c2b38bded24a6ec6a5c68d5647 100644 (file)
--- a/Server/src/httprequest.cpp
+++ b/Server/src/httprequest.cpp
@@ -44,6 +44,7 @@ PlaQui::Server::HTTPRequest::HTTPRequest(const std::string& version):
 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

+/*

 PlaQui::Server::HTTPRequest::HTTPRequest(const Serializable& body,
                const std::string& version):
                PlaQui::Server::HTTPMessage(body, version) {
 PlaQui::Server::HTTPRequest::HTTPRequest(const Serializable& body,
                const std::string& version):
                PlaQui::Server::HTTPMessage(body, version) {


@@ -62,31 +63,15 @@ PlaQui::Server::HTTPRequest::HTTPRequest(const std::string& uri,
                << " | body = " << body.serialize() << std::endl;
 #endif // DEBUG
 }
                << " | body = " << body.serialize() << std::endl;
 #endif // DEBUG
 }

+*/

 
 

-void PlaQui::Server::HTTPRequest::serialize(std::ostream& os) {
+std::istream& operator>>(std::istream& is, PlaQui::Server::HTTPRequest& req) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": serialize()" << std::endl;
+       std::cerr << __FILE__ << ": operator>>()" << std::endl;

 #endif // DEBUG
 #endif // DEBUG

-       os << method << " " << uri;
-       if (query_string.length()) {
-               os << "?" << query;
-       }
-       os << "HTTP/" << version << "\r\l" << std::flush; // TODO ver que este bien el \r\l
-       HTTPMessage::serilize(os);
-       if (headers.size()) {
-               headers.serilize(os);
-       }
-       os << "\r\l" << std::flush;
-       if (body.size()) {
-               body.serilize(os);
-       }
-}
-
-void PlaQui::Server::HTTPRequest::unserialize(std::istream& is) {
-       const unsigned BUFFER_SIZE = 4096;
-       char buf[BUFFER_SIZE];
+       char buf[BUFSIZ];

        // Obtengo primera línea (request)
        // Obtengo primera línea (request)

-       is.getline(buf, BUFFER_SIZE);
+       is.getline(buf, BUFSIZ);

 #ifdef DEBUG
        std::cerr << "Recibiendo linea: " << buf << std::endl;
 #endif // DEBUG
 #ifdef DEBUG
        std::cerr << "Recibiendo linea: " << buf << std::endl;
 #endif // DEBUG


@@ -145,7 +130,19 @@ void PlaQui::Server::HTTPRequest::unserialize(std::istream& is) {
                query  = "";
        }
        uri = line.substr(0, pos);
                query  = "";
        }
        uri = line.substr(0, pos);

-       // Fin de request, obtengo cabeceras y cuerpo.
-       HTTPMessage::unserialize(is);
+       // Fin de request, obtengo el mensaje.
+       is >> *(static_cast<HTTPMessage*>(this));
+}
+
+std::ostream& operator<<(std::ostream& os, PlaQui::Server::HTTPRequest& req) {
+#ifdef DEBUG
+       std::cerr << __FILE__ << ": operator<<()" << std::endl;
+#endif // DEBUG
+       os << method << " " << uri;
+       if (query_string.length()) {
+               os << "?" << query;
+       }
+       // TODO ver que este bien el \r\l
+       os << " HTTP/" << version << "\r\l" << *(static_cast<HTTPMessage*>(this));

 }
 
 }
 

diff --git a/Server/src/httpresponse.cpp b/Server/src/httpresponse.cpp
new file mode 100644 (file)
index 0000000..fb6ba78
--- /dev/null
+++ b/Server/src/httpresponse.cpp
@@ -0,0 +1,124 @@
+// vim: set noexpandtab tabstop=4 shiftwidth=4:
+//----------------------------------------------------------------------------
+//                                  PlaQui
+//----------------------------------------------------------------------------
+// This file is part of PlaQui.
+//
+// PlaQui is free software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the Free Software
+// Foundation; either version 2 of the License, or (at your option) any later
+// version.
+//
+// PlaQui is distributed in the hope that it will be useful, but WITHOUT ANY
+// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+// details.
+//
+// You should have received a copy of the GNU General Public License along
+// with PlaQui; if not, write to the Free Software Foundation, Inc., 59 Temple
+// Place, Suite 330, Boston, MA  02111-1307  USA
+//----------------------------------------------------------------------------
+// Creado:  dom oct 26 22:11:03 ART 2003
+// Autores: Leandro Lucarella <llucare@fi.uba.ar>
+//----------------------------------------------------------------------------
+//
+// $Id$
+//
+
+#include "plaqui/server/httpresponse.h"
+#include "plaqui/server/string.h"
+#ifdef DEBUG
+#      include <iostream>
+#endif // DEBUG
+
+PlaQui::Server::HTTPRequest::~HTTPResponse(void) {
+#ifdef DEBUG
+       std::cerr << __FILE__ << ": destructor." << std::endl;
+#endif // DEBUG
+}
+
+PlaQui::Server::HTTPResponse::HTTPResponse(const std::string& version):
+               PlaQui::Server::HTTPMessage(version) {
+#ifdef DEBUG
+       std::cerr << __FILE__ << ": http_version = " << http_version << std::endl;
+#endif // DEBUG
+}
+
+/*
+PlaQui::Server::HTTPResponse::HTTPResponse(const Serializable& body,
+               const std::string& version):
+               PlaQui::Server::HTTPMessage(body, version) {
+#ifdef DEBUG
+       std::cerr << __FILE__ << ": http_version = " << http_version
+               << " | body = " << body.serialize() << std::endl;
+#endif // DEBUG
+}
+
+PlaQui::Server::HTTPResponse::HTTPResponse(const std::string& uri,
+               const PlaQui::Server::HTTPResponse::HTTPMethod& method,
+               std::string& query, std::string& version):
+               PlaQui::Server::HTTPMessage(body, version) {
+#ifdef DEBUG
+       std::cerr << __FILE__ << ": http_version = " << http_version
+               << " | body = " << body.serialize() << std::endl;
+#endif // DEBUG
+}
+*/
+
+std::istream& operator>>(std::istream& is, PlaQui::Server::HTTPResponse& req) {
+#ifdef DEBUG
+       std::cerr << __FILE__ << ": operator>>()" << std::endl;
+#endif // DEBUG
+       char buf[BUFSIZ];
+       // Obtengo primera línea (request)
+       is.getline(buf, BUFSIZ);
+#ifdef DEBUG
+       std::cerr << "Recibiendo linea: " << buf << std::endl;
+#endif // DEBUG
+       String line = buf;
+       // Si es la primera línea, es el request.
+       if (line.to_upper().substr(0, 4) != "HTTP/") {
+               // FIXME - poner excepciones lindas.
+               throw "Not a HTTP response";
+       }
+       // Averiguo la versión.
+       std::string::size_type pos = line.find_first_of(String::SPACE_CHARS, 5);
+       std::string ver = line.substr(5, pos); 
+       if ((ver == "1.1") || (ver == "1.0")) {
+               version = ver;
+       } else {
+               // FIXME - poner excepciones lindas.
+               throw "Invalid HTTP version";
+       }
+       // Si tiene sólo la versión HTTP, no es válido.
+       line = line.substr(pos + 1).trim();
+       if (!line.length()) {
+               // FIXME - poner excepciones lindas.
+               throw "Invalid HTTP response";
+       }
+       // Si tiene más espacios, tengo la razón (reason).
+       pos = line.find_first_of(String::SPACE_CHARS);
+       if (pos != std::string::npos) {
+               // Si el resto es un protocolo válido, agrego más variables.
+               String reas = line.substr(pos + 1).trim();
+               line = line.substr(0, pos);
+       }
+       line = line.trim();
+       // Seteo el código.
+       if (line.length() != 3) {
+               // FIXME - poner excepciones lindas.
+               throw "Invalid response code";
+       }
+       stringstream ss = line; // TODO ver forma mas linda de convertir
+       ss >> status_code;
+}
+
+std::ostream& operator<<(std::ostream& os, PlaQui::Server::HTTPResponse& req) {
+#ifdef DEBUG
+       std::cerr << __FILE__ << ": operator<<()" << std::endl;
+#endif // DEBUG
+       os << "HTTP/" << version << " " << status_code << " " << reason << "\r\l";
+       // TODO ver que este bien el \r\l
+       os << *(static_cast<HTTPMessage*>(this));
+}
+