- Se arregla el bug de ControlClient::get_host() y ControlClient::get_port().

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

diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp
index 7a4cedc0ba2944eaa9f6a1b86020f887d7e1db7a..32d3306254d717919069c56f0f8cb6c68f743f58 100644 (file)
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -27,10 +27,12 @@
 
 #include "plaqui/server/controlserver.h"
 #include "plaqui/server/command.h"
 
 #include "plaqui/server/controlserver.h"
 #include "plaqui/server/command.h"

-#include "plaqui/server/string.h"
-#include <cstring>
-#include <sstream>
+#include "plaqui/server/httperror.h"
+#include "plaqui/server/httpresponse.h"
+//#include <cstring>
+//#include <sstream>

 #ifdef DEBUG
 #ifdef DEBUG

+#      include "plaqui/server/string.h"

 #      include <iostream>
 #endif // DEBUG
 
 #      include <iostream>
 #endif // DEBUG
 


@@ -47,7 +49,7 @@ ControlServer::~ControlServer(void) {
 }
 
 ControlServer::ControlServer(const sockbuf::sockdesc& sd):
 }
 
 ControlServer::ControlServer(const sockbuf::sockdesc& sd):

-               ServerConnection(sd) {
+               Connection(sd) {

 #ifdef DEBUG
        cerr << __FILE__ << ": sd = " << sd.sock << endl;
 #endif // DEBUG
 #ifdef DEBUG
        cerr << __FILE__ << ": sd = " << sd.sock << endl;
 #endif // DEBUG


@@ -61,21 +63,27 @@ void ControlServer::real_run(void) {
        while (!stop) {
                Command command;
                try {
        while (!stop) {
                Command command;
                try {

+                       //Glib::Mutex::Lock lock(socket_mutex);

                        socket >> command;
                        socket >> command;

-               } catch (const char* e) {
-                       cerr << "    (" << __LINE__ << ") Error: " << e << endl;
+               // Si se cerró el socket.
+               } catch (const ios::failure& e) {

                        stop = true;
                        continue;
                        stop = true;
                        continue;

-               } catch (string e) {
-                       cerr << "    (" << __LINE__ << ") Error: " << e << endl;
-                       stop = true;
-                       continue;
-               } catch (...) {
-                       cerr << "    (" << __LINE__ << ") Error desconocido!" << endl;
-                       stop = true;
+               // Si hay un error al parsear el comando, se envia una respuesta con el
+               // error.
+               } catch (const HTTPError& e) {
+#ifdef DEBUG
+                       cerr << __FILE__ << " : real_run() ERROR: status_code = "
+                               << e.code << " | reason = " << HTTPMessage::reason(e.code)
+                               << " | desc = " << e.what() << endl;
+#endif // DEBUG
+                       //Glib::Mutex::Lock lock(socket_mutex);
+                       socket << HTTPResponse(e) << flush;

                        continue;
                }
                // TODO agregar las verificaciones de abajo a HTTPRequest y padres.
                        continue;
                }
                // TODO agregar las verificaciones de abajo a HTTPRequest y padres.

+               // Actualizacion: Estoy usando trim() en casi todos lados, no debería
+               // ser necesario.

 /*
                // 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;


@@ -110,31 +118,27 @@ void ControlServer::real_run(void) {
                        }
                }
 */
                        }
                }
 */

-               // TODO: Manda el comando.
-               // Command command = parse_command(request.uri);
-               //signal_command_received().emit(command);

 #ifdef DEBUG
 #ifdef DEBUG

-               cerr << "Comando: target = " << command.get_target()
-                       << " | command = " << command.get_command()
+               cerr << __FILE__ << " : real_run() Despachando comando: target = "
+                       << command.get_target() << " | command = " << command.get_command()

                        << " | args = [" << String::join(command.get_args(), ", ") << "]"
                        << endl;
                        << " | args = [" << String::join(command.get_args(), ", ") << "]"
                        << endl;

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

 #endif // DEBUG
 #endif // DEBUG

+               // Manda el comando.
+               command_received(command);

                // 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.
                // 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;
-               socket << "HTTP/1.0 200 OK" << endl;
+               //stringstream response_xml;
+               //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
 Accept-Ranges: bytes
 */
 /*
 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
 Accept-Ranges: bytes
 */

+/*

                socket << "Content-Type: text/html; charset=iso-8859-1" << endl;
                response_xml << "<html>" << endl;
                response_xml << "    <head>" << endl;
                socket << "Content-Type: text/html; charset=iso-8859-1" << endl;
                response_xml << "<html>" << endl;
                response_xml << "    <head>" << endl;


@@ -145,15 +149,6 @@ Accept-Ranges: bytes
                response_xml << "        <p>versión 0.4</p>" << endl;
                response_xml << "        <h2>Comando</h2>" << endl;
                response_xml << "        <ul>" << endl;
                response_xml << "        <p>versión 0.4</p>" << endl;
                response_xml << "        <h2>Comando</h2>" << endl;
                response_xml << "        <ul>" << endl;

-/*             response_xml << "           <li><b>Versión:</b> " << request.version << endl;
-               response_xml << "           <li><b>Método:</b> " << (request.method ? "POST" : "GET") << endl;
-               response_xml << "           <li><b>URI:</b> " << request.uri << endl;
-               response_xml << "           <li><b>Query:</b> " << request.query << endl;
-               for (HTTPHeaders::const_iterator i = request.headers.begin();
-                               i != request.headers.end(); i++) {
-                       response_xml << "           <li><b>" << i->first << ":</b> "
-                               << i->second << endl;
-               }*/

                response_xml << "           <li><b>Target:</b> " << command.get_target() << endl;
                response_xml << "           <li><b>Command:</b> " << command.get_command() << endl;
                response_xml << "           <li><b>Argumentos:</b>" << endl;
                response_xml << "           <li><b>Target:</b> " << command.get_target() << endl;
                response_xml << "           <li><b>Command:</b> " << command.get_command() << endl;
                response_xml << "           <li><b>Argumentos:</b>" << endl;


@@ -179,9 +174,22 @@ Accept-Ranges: bytes
                socket << "Content-Length: " << response_xml.str().length() << endl;
                socket << endl;
                socket << response_xml.str() << flush;
                socket << "Content-Length: " << response_xml.str().length() << endl;
                socket << endl;
                socket << response_xml.str() << flush;

+*/

        }
 }
 
        }
 }
 

+void ControlServer::send(const HTTPResponse& response) {
+       //Glib::Mutex::Lock lock(socket_mutex);
+       socket << response << flush;
+#ifdef DEBUG
+       cerr << __FILE__ << ": send() Enviado!" << endl;
+#endif // DEBUG
+}
+
+ControlServer::SignalCommandReceived& ControlServer::signal_command_received(void) {
+       return command_received;
+}
+

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