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

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index c97da08..c110808 100644
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -41,14 +41,16 @@ 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 ("
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": version = " << version << " | body ("
 		<< _body.length() << ") = " << _body << endl;
 #endif // DEBUG
 	headers["Accept-Ranges"] = "bytes";
@@ -64,9 +66,11 @@ 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];
 	while (is.getline(buf, BUFSIZ)) {
@@ -79,11 +83,25 @@ istream& operator>>(istream& is, HTTPMessage& m) {
 		} else {
 			// Hay Content-Length, entonces hay body (no respeta RFC AFAIK).
 			if (m.headers.find("Content-Length") != m.headers.end()) {
-				streamsize size;
+				streamsize size, readed;
 				to(m.headers["Content-Length"], size);
 				char* const buf2 = new char[size+1];
-				if (is.readsome(buf2, size)) {
-					m.body = buf2;
+				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;
 			}
@@ -97,7 +115,8 @@ istream& operator>>(istream& is, HTTPMessage& m) {
 
 ostream& operator<<(ostream& os, const HTTPMessage& m) {
 #ifdef DEBUG
-	cerr << __FILE__ << ": operator<<()" << endl;
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": operator<<()" << endl;
 #endif // DEBUG
 	return os << m.headers << "\r\n" // Fin de cabeceras
 		<< m.body;