Mini bugfix.

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

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index af2875ecfcb441e2c48202033be7db999c135189..c11080880bac6d2f57bf3510561a2acee05c468d 100644 (file)
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -41,77 +41,84 @@ namespace Server {
 
 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
-       cerr << __FILE__ << ": version = " << version << " | body.length = "
-               << _body.length() << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": version = " << version << " | body ("
+               << _body.length() << ") = " << _body << endl;
 #endif // DEBUG
+       headers["Accept-Ranges"] = "bytes";
        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());
-               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;
 }
 
-istream& operator>>(istream& is, HTTPMessage& m) {
+istream& operator>>(istream& is, HTTPMessage& m)
+               throw(HTTPError, sockerr, ios::failure) {
 #ifdef DEBUG
-       cerr << __FILE__ << ": operator>>()" << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": operator>>()" << endl;
 #endif // DEBUG
        char buf[BUFSIZ];
-       bool is_header = true;
-       // 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);
                sbuf.trim();
                if (sbuf.length()) {
-                       if (is_header) {
-                               stringstream ss;
-                               ss << sbuf;
-                               ss >> m.headers;
-                       }// else { TODO body
-                       //      body_ss << sbuf << endl;
-                       //}
+                       stringstream ss(sbuf);
+                       ss >> m.headers;
+               // Fin de las cabeceras.
                } 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;
-                               break;
-                       }// else { TODO body
-                       //      body_ss << sbuf << 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 body
-       //m.body = body_ss.str();
        return is;
 }
 
 ostream& operator<<(ostream& os, const HTTPMessage& m) {
 #ifdef DEBUG
-       cerr << __FILE__ << ": operator<<()" << endl;
+       cerr << __FILE__ << "(" << __LINE__ << ")"
+               << ": operator<<()" << endl;
 #endif // DEBUG
-       return os << m.headers << "\n\r" // Fin de cabeceras
+       return os << m.headers << "\r\n" // Fin de cabeceras
                << m.body;
 }
 
@@ -122,6 +129,8 @@ string HTTPMessage::reason(unsigned code) {
                        return "OK";
                case BAD_REQUEST:
                        return "Bad Request";
+               case NOT_FOUND:
+                       return "Not Found";
                case LENGTH_REQUIRED:
                        return "Length Required";
                case INTERNAL_SERVER_ERROR:
@@ -131,7 +140,7 @@ string HTTPMessage::reason(unsigned code) {
                case HTTP_VERSION_NOT_SUPPORTED:
                        return "HTTP Version Not Supported";
                default:
-                       return "";
+                       return "No Reason";
        }
 }