X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/a143e957a68145eece4b5b60e0bf8bee0d0693cd..eb95b779b5006ce4ef16ee1ffc1d15557d31ccef:/Server/src/httpmessage.cpp?ds=sidebyside

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index 737f636..578f563 100644
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -25,6 +25,7 @@
 // $Id$
 //
 
+#include "plaqui/server/string.h"
 #include "plaqui/server/httpmessage.h"
 #include <sstream>
 #include <cstdlib>
@@ -33,7 +34,10 @@
 #endif // DEBUG
 
 using namespace std;
-using namespace PlaQui::Server;
+
+namespace PlaQui {
+	
+namespace Server {
 
 HTTPMessage::~HTTPMessage(void) {
 #ifdef DEBUG
@@ -41,30 +45,21 @@ HTTPMessage::~HTTPMessage(void) {
 #endif // DEBUG
 }
 
-HTTPMessage::HTTPMessage(const string& version):
-		version(version) {
-#ifdef DEBUG
-	cerr << __FILE__ << ": version = " << version << endl;
-#endif // DEBUG
-}
-
-/*
-HTTPMessage::HTTPMessage(const string& _body,
-		const string& http_version):
-		http_version(http_version) {
+HTTPMessage::HTTPMessage(const string& _body, const string& _version):
+		version(_version) {
 #ifdef DEBUG
-	cerr << __FILE__ << ": http_version = " << http_version
-		<< " | body = " << body << endl;
+	cerr << __FILE__ << ": version = " << version << " | body ("
+		<< _body.length() << ") = " << _body << endl;
 #endif // DEBUG
 	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();
+		ss << (body.length()); // FIXME No se por que tengo que sumarle 1.
+		headers["Accept-Ranges"] = "bytes";
 		headers["Content-Length"] = ss.str();
 	}
 }
@@ -78,34 +73,65 @@ istream& operator>>(istream& is, HTTPMessage& m) {
 	cerr << __FILE__ << ": operator>>()" << endl;
 #endif // DEBUG
 	char buf[BUFSIZ];
-	bool is_header = true;
-	stringstream body_ss;
 	while (is.getline(buf, BUFSIZ)) {
-		string sbuf = buf;
-		if (sbuf.length())
-			if (is_header) {
-				istringstream(buf) >> m.headers;
-			} else {
-				body_ss << buf << endl;
-			}
+		String sbuf(buf);
+		sbuf.trim();
+		if (sbuf.length()) {
+			stringstream ss;
+			ss << sbuf;
+			ss >> m.headers;
+		// Fin de las cabeceras.
 		} else {
-			if (is_header) {
-				is_header = false;
-			} else {
-				body_ss << buf << 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 si el body es un serializable, deberia auto deserializarse.
-	body = body_ss.str();
 	return is;
 }
 
-ostream& operator<<(ostream& os, HTTPMessage) {
+ostream& operator<<(ostream& os, const HTTPMessage& m) {
 #ifdef DEBUG
 	cerr << __FILE__ << ": operator<<()" << endl;
 #endif // DEBUG
-	return os << headers << "\r\n" // 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
+