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 ba2b82596de3a251209b7ef77e30c445c2a191be..c11080880bac6d2f57bf3510561a2acee05c468d 100644 (file)
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -41,60 +41,69 @@ namespace Server {
 
 HTTPMessage::~HTTPMessage(void) {
 #ifdef DEBUG
 
 HTTPMessage::~HTTPMessage(void) {
 #ifdef DEBUG

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

 #endif // DEBUG
 }
 
 HTTPMessage::HTTPMessage(const string& _body, const string& _version):
                version(_version) {
 #ifdef DEBUG
 #endif // DEBUG
 }
 
 HTTPMessage::HTTPMessage(const string& _body, const string& _version):
                version(_version) {
 #ifdef DEBUG

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

 #endif // DEBUG
 #endif // DEBUG

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

        set_body(_body);
 }
 
 void HTTPMessage::set_body(const string& _body) {
        body = _body;
        set_body(_body);
 }
 
 void HTTPMessage::set_body(const string& _body) {
        body = _body;

-       if (body.length()) {
-               stringstream ss; // TODO ver forma mas linda de convertir
-               ss << (body.length()+1); // FIXME No se por que tengo que sumarle 1.
-               headers["Accept-Ranges"] = "bytes";
-               headers["Content-Length"] = ss.str();
-       }
+       headers["Content-Length"] = String().from(body.length());

 }
 
 const string& HTTPMessage::get_body(void) const {
        return body;
 }
 
 }
 
 const string& HTTPMessage::get_body(void) const {
        return body;
 }
 

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

 #ifdef DEBUG
 #ifdef DEBUG

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

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

-       bool is_header = true;

        while (is.getline(buf, BUFSIZ)) {
                String sbuf(buf);
                sbuf.trim();
                if (sbuf.length()) {
        while (is.getline(buf, BUFSIZ)) {
                String sbuf(buf);
                sbuf.trim();
                if (sbuf.length()) {

-                       stringstream ss;
-                       ss << sbuf;
+                       stringstream ss(sbuf);

                        ss >> m.headers;
                // Fin de las cabeceras.
                } else {
                        // Hay Content-Length, entonces hay body (no respeta RFC AFAIK).
                        if (m.headers.find("Content-Length") != m.headers.end()) {
                        ss >> m.headers;
                // Fin de las cabeceras.
                } else {
                        // Hay Content-Length, entonces hay body (no respeta RFC AFAIK).
                        if (m.headers.find("Content-Length") != m.headers.end()) {

-                               // Descarta la línea vacía para separar las cabeceras.
-                               is.getline(buf, BUFSIZ);
-                               stringstream ss(m.headers["Content-Length"]);
-                               streamsize size;
-                               ss >> size;
-                               char* buf2 = new char[size+1];
-                               if (is.readsome(buf2, size)) {
-                                       m.body = buf2;
+                               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[];
+                               delete []buf2;

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


@@ -106,9 +115,10 @@ istream& operator>>(istream& is, HTTPMessage& m) {
 
 ostream& operator<<(ostream& os, const HTTPMessage& m) {
 #ifdef DEBUG
 
 ostream& operator<<(ostream& os, const HTTPMessage& m) {
 #ifdef DEBUG

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

 #endif // DEBUG
 #endif // DEBUG

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

                << m.body;
 }
 
                << m.body;
 }