Se agrega un try para tratar de solucionar situaciones en las que el server

[z.facultad/75.42/plaqui.git] / Server / src / httpmessage.cpp

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index 2d3a18bca1f5bc09836efbdfc9058cad8b18431e..c11080880bac6d2f57bf3510561a2acee05c468d 100644 (file)
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -25,83 +25,126 @@
 // $Id$
 //
 
 // $Id$
 //
 

+#include "plaqui/server/string.h"

 #include "plaqui/server/httpmessage.h"
 #include "plaqui/server/httpmessage.h"

+#include <sstream>

 #include <cstdlib>
 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
 
 #include <cstdlib>
 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
 

-PlaQui::Server::HTTPMessage::~HTTPMessage(void) {
-#ifdef DEBUG
-       std::cerr << __FILE__ << ": destructor." << std::endl;
-#endif // DEBUG
-}
+using namespace std;
+
+namespace PlaQui {
+       
+namespace Server {

 
 

-PlaQui::Server::HTTPMessage::HTTPMessage(const std::string& http_version):
-               http_version(http_version) {
+HTTPMessage::~HTTPMessage(void) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": http_version = " << http_version << std::endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": destructor." << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-/*
-PlaQui::Server::HTTPMessage::HTTPMessage(const std::string& _body,
-               const std::string& http_version):
-               http_version(http_version) {
+HTTPMessage::HTTPMessage(const string& _body, const string& _version):
+               version(_version) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": http_version = " << http_version
-               << " | body = " << body << std::endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": version = " << version << " | body ("
+               << _body.length() << ") = " << _body << endl;

 #endif // DEBUG
 #endif // DEBUG

+       headers["Accept-Ranges"] = "bytes";

        set_body(_body);
 }
        set_body(_body);
 }

-*/

 
 

-void PlaQui::Server::HTTPMessage::set_body(const std::string& _body) {
+void HTTPMessage::set_body(const string& _body) {

        body = _body;
        body = _body;

-       if (body.length()) {
-               stringstream ss; // TODO ver forma mas linda de convertir
-               ss << body.length();
-               headers["Content-Length"] = ss.str();
-       }
+       headers["Content-Length"] = String().from(body.length());

 }
 
 }
 

-const std::string& PlaQui::Server::HTTPMessage::get_body(void) {
+const string& HTTPMessage::get_body(void) const {

        return body;
 }
 
        return body;
 }
 

-istream& operator>>(std::istream& is, PlaQui::Server::HTTPMessage) {
+istream& operator>>(istream& is, HTTPMessage& m)
+               throw(HTTPError, sockerr, ios::failure) {

 #ifdef DEBUG
 #ifdef DEBUG

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

 #endif // DEBUG
        char buf[BUFSIZ];
 #endif // DEBUG
        char buf[BUFSIZ];

-       bool is_header = true;
-       stringstream body_ss;

        while (is.getline(buf, BUFSIZ)) {
        while (is.getline(buf, BUFSIZ)) {

-               std::string sbuf = buf;
-               if (sbuf.length())
-                       if (is_header) {
-                               istringstream(buf) >> m.headers;
-                       } else {
-                               body_ss << buf << std::endl;
-                       }
+               String sbuf(buf);
+               sbuf.trim();
+               if (sbuf.length()) {
+                       stringstream ss(sbuf);
+                       ss >> m.headers;
+               // Fin de las cabeceras.

                } else {
                } else {

-                       if (is_header) {
-                               is_header = false;
-                       } else {
-                               body_ss << buf << std::endl;
+                       // Hay Content-Length, entonces hay body (no respeta RFC AFAIK).
+                       if (m.headers.find("Content-Length") != m.headers.end()) {
+                               streamsize size, readed;
+                               to(m.headers["Content-Length"], size);
+                               char* const buf2 = new char[size+1];
+                               is.read(buf2, size);
+                               if (is.gcount() == size) {
+                                       // Agrego fin de string porque el readsome no lo hace.
+                                       buf2[size] = '\0';
+                                       m.set_body(buf2);
+#ifdef DEBUG
+                                       cerr << __FILE__ << "(" << __LINE__ << ")"
+                                               << ": operator>>() raaaaw body: " << buf2 << endl;
+#endif // DEBUG
+                               } else {
+                                       // TODO else dar error?
+#ifdef DEBUG
+                                       cerr << __FILE__ << "(" << __LINE__ << ")"
+                                               << ": operator>>() ERROR: No se pudo leer el mensaje completo. Se leyeron sóolo "
+                                               << is.gcount() << " bytes de " << size << " que deberían haberse leído." << endl;
+#endif // DEBUG
+                               }
+                               delete []buf2;

                        }
                        }

+                       // Después de una línea vacía, haya obtenido el body o no, sale del
+                       // while.
+                       break;

                }
        }
                }
        }

-       // TODO si el body es un serializable, deberia auto deserializarse.
-       body = body_ss.str();

        return is;
 }
 
        return is;
 }
 

-ostream& operator<<(std::ostream& os, PlaQui::Server::HTTPMessage) {
+ostream& operator<<(ostream& os, const HTTPMessage& m) {

 #ifdef DEBUG
 #ifdef DEBUG

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

 #endif // DEBUG
 #endif // DEBUG

-       return os << headers << "\r\l" // Fin de cabeceras
-               << body;
+       return os << m.headers << "\r\n" // Fin de cabeceras
+               << m.body;

 }
 
 }
 

+string HTTPMessage::reason(unsigned code) {
+       switch (code) {
+               // TODO completar los códigos.
+               case OK:
+                       return "OK";
+               case BAD_REQUEST:
+                       return "Bad Request";
+               case NOT_FOUND:
+                       return "Not Found";
+               case LENGTH_REQUIRED:
+                       return "Length Required";
+               case INTERNAL_SERVER_ERROR:
+                       return "Internal Server Error";
+               case NOT_IMPLEMENTED:
+                       return "Not Implemented";
+               case HTTP_VERSION_NOT_SUPPORTED:
+                       return "HTTP Version Not Supported";
+               default:
+                       return "No Reason";
+       }
+}
+
+} // namespace Server
+
+} // namespace PlaQui
+