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

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

diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp
index 544483fadade053c10fe81b4dac59524b4233c93..144d236e2b967140c28aa4b05ad0da38b63909af 100644 (file)
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -26,37 +26,47 @@
 //
 
 #include "plaqui/server/controlserver.h"
 //
 
 #include "plaqui/server/controlserver.h"

-#include "plaqui/server/request.h"
+#include "plaqui/server/httprequest.h"

 #include <cstring>
 #include <sstream>
 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
 
 #include <cstring>
 #include <sstream>
 #ifdef DEBUG
 #      include <iostream>
 #endif // DEBUG
 

-PlaQui::Server::ControlServer::~ControlServer(void) {
+using namespace std;
+
+namespace PlaQui {
+
+namespace Server {
+
+ControlServer::~ControlServer(void) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": destructor." << std::endl;
+       cerr << __FILE__ << ": destructor." << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-PlaQui::Server::ControlServer::ControlServer(const sockbuf::sockdesc& sd):
-               Connection(sd) {
+ControlServer::ControlServer(const sockbuf::sockdesc& sd):
+               ServerConnection(sd) {

 #ifdef DEBUG
 #ifdef DEBUG

-       std::cerr << __FILE__ << ": sd = " << sd.sock << std::endl;
+       cerr << __FILE__ << ": sd = " << sd.sock << endl;

 #endif // DEBUG
 }
 
 #endif // DEBUG
 }
 

-void PlaQui::Server::ControlServer::real_run(void) {
-       // FIXME se tiene que ir a la clase para poder frenarlo desde afuera.
-       bool stop = false;
-       char buf[BUFFER_SIZE];
+void ControlServer::real_run(void) {
+#ifdef DEBUG
+       cerr << __FILE__ << ": real_run()" << endl;
+#endif // DEBUG
+       //char buf[BUFSIZ];

        while (!stop) {
        while (!stop) {

-               Request request;
+               HTTPRequest request;
+               socket >> request;
+               // TODO agregar las verificaciones de abajo a HTTPRequest y padres.
+/*

                // Primera línea no vacía (que debe ser el request).
                bool is_first = true;
                // Primera línea no vacía (que debe ser el request).
                bool is_first = true;

-               while (!stop && socket.getline(buf, BUFFER_SIZE)) {
+               while (!stop && socket.getline(buf, BUFSIZ)) {

 #ifdef DEBUG
 #ifdef DEBUG

-                       std::cerr << "Reciviendo linea: " << buf << std::endl;
+                       cerr << __FILE__ << "  Recibiendo inea: " << buf << endl;

 #endif // DEBUG
                        int len = strlen(buf);
                        // Si tiene un retorno de carro, lo elimina.
 #endif // DEBUG
                        int len = strlen(buf);
                        // Si tiene un retorno de carro, lo elimina.


@@ -84,57 +94,64 @@ void PlaQui::Server::ControlServer::real_run(void) {
                                // Si es la primera, no pasa nada, sigue esperando un request.
                        }
                }
                                // Si es la primera, no pasa nada, sigue esperando un request.
                        }
                }

-               // TODO: Manda mensaje a la planta.
-               //signal_command_received().emit(request);
-               //dispatch_command(parse_command(sstr.str()));
+*/
+               // TODO: Manda el comando.
+               // Command command = parse_command(request.uri);
+               //signal_command_received().emit(command);

 #ifdef DEBUG
 #ifdef DEBUG

-               std::cerr << "Request: " << std::endl;
-               for (Request::const_iterator i = request.begin(); i != request.end();
-                               i++) {
-                       std::cerr << "   " << i->first << ": " << i->second << std::endl;
-               }
+               cerr << "Request: " << request << endl;
+               //for (HTTPRequest::const_iterator i = request.begin();
+               //              i != request.end(); i++) {
+               //      cerr << "   " << i->first << ": " << i->second << endl;
+               //}

 #endif // DEBUG
                // FIXME - hacer respuesta XML.
 #endif // DEBUG
                // FIXME - hacer respuesta XML.

+               // La respuesta hay que mandarla asincrónicamente porque no puedo
+               // responder hasta que la planta no se termine de actualizar, por
+               // ejemplo.

                stringstream response_xml;
                stringstream response_xml;

-               socket << "HTTP/1.0 200 OK" << std::endl;
+               socket << "HTTP/1.0 200 OK" << endl;

 /*
 Date: Sun, 19 Oct 2003 15:11:14 GMT
 Server: Apache/1.3.28 (Debian GNU/Linux)
 Last-Modified: Mon, 28 Apr 2003 07:50:08 GMT
 /*
 Date: Sun, 19 Oct 2003 15:11:14 GMT
 Server: Apache/1.3.28 (Debian GNU/Linux)
 Last-Modified: Mon, 28 Apr 2003 07:50:08 GMT

-ETag: "110f4043-11a1-3eacdd30"

 Accept-Ranges: bytes
 */
 Accept-Ranges: bytes
 */

-               socket << "Content-Type: text/html; charset=iso-8859-1" << std::endl;
-               response_xml << "<html>" << std::endl;
-               response_xml << "    <head>" << std::endl;
-               response_xml << "        <title>PlaQui v0.1</title>" << std::endl;
-               response_xml << "    </head>" << std::endl;
-               response_xml << "    <body>" << std::endl;
-               response_xml << "        <h1>PlaQui</h1>" << std::endl;
-               response_xml << "        <p>versión 0.2</p>" << std::endl;
-               response_xml << "        <h2>Pedido HTTP</h2>" << std::endl;
-               response_xml << "        <ul>" << std::endl;
-               for (Request::const_iterator i = request.begin(); i != request.end();
-                               i++) {
+               socket << "Content-Type: text/html; charset=iso-8859-1" << endl;
+               response_xml << "<html>" << endl;
+               response_xml << "    <head>" << endl;
+               response_xml << "        <title>PlaQui v0.1</title>" << endl;
+               response_xml << "    </head>" << endl;
+               response_xml << "    <body>" << endl;
+               response_xml << "        <h1>PlaQui</h1>" << endl;
+               response_xml << "        <p>versión 0.2</p>" << endl;
+               response_xml << "        <h2>Pedido HTTP</h2>" << endl;
+               response_xml << "        <ul>" << endl;
+               for (HTTPHeaders::const_iterator i = request.headers.begin();
+                               i != request.headers.end(); i++) {

                        response_xml << "           <li><b>" << i->first << ":</b> "
                        response_xml << "           <li><b>" << i->first << ":</b> "

-                               << i->second << std::endl;
+                               << i->second << endl;

                }
                }

-               response_xml << "        </ul>" << std::endl;
-               response_xml << "        <h2>Desarrollado por</h2>" << std::endl;
-               response_xml << "        <ul>" << std::endl;
-               response_xml << "            <li>Nicolás Dimov.</li>" << std::endl;
-               response_xml << "            <li>Leandro Lucarella.</li>" << std::endl;
-               response_xml << "            <li>Ricardo Markiewicz.</li>" << std::endl;
-               response_xml << "        </ul>" << std::endl;
-               response_xml << "        <address>" << std::endl;
-               response_xml << "             Copyleft 2003 - bajo los " << std::endl;
-               response_xml << "             términos de la licencia GPL" << std::endl;
-               response_xml << "        </address>" << std::endl;
-               response_xml << "    </body>" << std::endl;
-               response_xml << "</html>" << std::endl;
-               socket << "Content-Length: " << response_xml.str().length() << std::endl;
-               socket << std::endl;
-               socket << response_xml.str() << std::flush;
+               response_xml << "        </ul>" << endl;
+               response_xml << "        <h2>Desarrollado por</h2>" << endl;
+               response_xml << "        <ul>" << endl;
+               response_xml << "            <li>Nicolás Dimov.</li>" << endl;
+               response_xml << "            <li>Leandro Lucarella.</li>" << endl;
+               response_xml << "            <li>Ricardo Markiewicz.</li>" << endl;
+               response_xml << "        </ul>" << endl;
+               response_xml << "        <address>" << endl;
+               response_xml << "             Copyleft 2003 - bajo los " << endl;
+               response_xml << "             términos de la licencia GPL" << endl;
+               response_xml << "        </address>" << endl;
+               response_xml << "    </body>" << endl;
+               response_xml << "</html>" << endl;
+               socket << "Content-Length: " << response_xml.str().length() << endl;
+               socket << endl;
+               socket << response_xml.str() << flush;

        }
 }
 
        }
 }
 

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