Se arreglan detalles, ya compila pero se cuelga cuando se conecta un cliente.

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

diff --git a/Server/src/httpmessage.cpp b/Server/src/httpmessage.cpp
index 737f6365dd0d94debd33e5be2ffb96ec9948e108..685fa69ad92b9e8912da6927f00cbbfc80c36ac5 100644 (file)
--- a/Server/src/httpmessage.cpp
+++ b/Server/src/httpmessage.cpp
@@ -33,7 +33,10 @@
 #endif // DEBUG
 
 using namespace std;
 #endif // DEBUG
 
 using namespace std;

-using namespace PlaQui::Server;
+
+namespace PlaQui {
+       
+namespace Server {

 
 HTTPMessage::~HTTPMessage(void) {
 #ifdef DEBUG
 
 HTTPMessage::~HTTPMessage(void) {
 #ifdef DEBUG


@@ -82,9 +85,11 @@ istream& operator>>(istream& is, HTTPMessage& m) {
        stringstream body_ss;
        while (is.getline(buf, BUFSIZ)) {
                string sbuf = buf;
        stringstream body_ss;
        while (is.getline(buf, BUFSIZ)) {
                string sbuf = buf;

-               if (sbuf.length())
+               if (sbuf.length()) {

                        if (is_header) {
                        if (is_header) {

-                               istringstream(buf) >> m.headers;
+                               stringstream ss;
+                               ss << buf;
+                               ss >> m.headers;

                        } else {
                                body_ss << buf << endl;
                        }
                        } else {
                                body_ss << buf << endl;
                        }


@@ -97,15 +102,19 @@ istream& operator>>(istream& is, HTTPMessage& m) {
                }
        }
        // TODO si el body es un serializable, deberia auto deserializarse.
                }
        }
        // TODO si el body es un serializable, deberia auto deserializarse.

-       body = body_ss.str();
+       m.body = body_ss.str();

        return is;
 }
 
        return is;
 }
 

-ostream& operator<<(ostream& os, HTTPMessage) {
+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 << headers << "\r\n" // Fin de cabeceras
-               << body;
+       return os << m.headers << "\n\r" // Fin de cabeceras
+               << m.body;

 }
 
 }
 

+} // namespace Server
+
+} // namespace PlaQui
+