Luca, si podes lleva esto, no creo que termine nada mas hoy

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

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index af2875ecfcb441e2c48202033be7db999c135189..578f563645ffeb8b6a41a02435d3a0daa1db5b23 100644 (file)
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -48,8 +48,8 @@ HTTPMessage::~HTTPMessage(void) {
 HTTPMessage::HTTPMessage(const string& _body, const string& _version):
                version(_version) {
 #ifdef DEBUG
 HTTPMessage::HTTPMessage(const string& _body, const string& _version):
                version(_version) {
 #ifdef DEBUG

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

 #endif // DEBUG
        set_body(_body);
 }
 #endif // DEBUG
        set_body(_body);
 }


@@ -58,7 +58,7 @@ void HTTPMessage::set_body(const string& _body) {
        body = _body;
        if (body.length()) {
                stringstream ss; // TODO ver forma mas linda de convertir
        body = _body;
        if (body.length()) {
                stringstream ss; // TODO ver forma mas linda de convertir

-               ss << (body.length());
+               ss << (body.length()); // FIXME No se por que tengo que sumarle 1.

                headers["Accept-Ranges"] = "bytes";
                headers["Content-Length"] = ss.str();
        }
                headers["Accept-Ranges"] = "bytes";
                headers["Content-Length"] = ss.str();
        }


@@ -73,37 +73,31 @@ istream& operator>>(istream& is, HTTPMessage& m) {
        cerr << __FILE__ << ": operator>>()" << endl;
 #endif // DEBUG
        char buf[BUFSIZ];
        cerr << __FILE__ << ": 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()) {
        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;
+                       ss << sbuf;
+                       ss >> m.headers;
+               // Fin de las cabeceras.

                } else {
                } 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()) {
+                               stringstream ss(m.headers["Content-Length"]);
+                               streamsize size;
+                               ss >> size;
+                               char* const buf2 = new char[size+1];
+                               if (is.readsome(buf2, size)) {
+                                       m.body = buf2;
+                               }
+                               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;
 }
 
        return is;
 }
 


@@ -111,7 +105,7 @@ ostream& operator<<(ostream& os, const HTTPMessage& m) {
 #ifdef DEBUG
        cerr << __FILE__ << ": operator<<()" << endl;
 #endif // DEBUG
 #ifdef DEBUG
        cerr << __FILE__ << ": operator<<()" << endl;
 #endif // DEBUG

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

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


@@ -122,6 +116,8 @@ string HTTPMessage::reason(unsigned code) {
                        return "OK";
                case BAD_REQUEST:
                        return "Bad Request";
                        return "OK";
                case BAD_REQUEST:
                        return "Bad Request";

+               case NOT_FOUND:
+                       return "Not Found";

                case LENGTH_REQUIRED:
                        return "Length Required";
                case INTERNAL_SERVER_ERROR:
                case LENGTH_REQUIRED:
                        return "Length Required";
                case INTERNAL_SERVER_ERROR:


@@ -131,7 +127,7 @@ string HTTPMessage::reason(unsigned code) {
                case HTTP_VERSION_NOT_SUPPORTED:
                        return "HTTP Version Not Supported";
                default:
                case HTTP_VERSION_NOT_SUPPORTED:
                        return "HTTP Version Not Supported";
                default:

-                       return "";
+                       return "No Reason";

        }
 }
 
        }
 }