X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/1de5f8fa25dcea9fb9de9707d75120f762ce3a87..6983220ff84632481c1628720fe15b8f3ac1c9cb:/Server/src/controlserver.cpp?ds=inline

diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp
index 753255e..32d3306 100644
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -26,37 +26,70 @@
 //
 
 #include "plaqui/server/controlserver.h"
-#include "plaqui/server/request.h"
-#include <cstring>
-#include <sstream>
+#include "plaqui/server/command.h"
+#include "plaqui/server/httperror.h"
+#include "plaqui/server/httpresponse.h"
+//#include <cstring>
+//#include <sstream>
 #ifdef DEBUG
+#	include "plaqui/server/string.h"
 #	include <iostream>
 #endif // DEBUG
 
-PlaQui::Server::ControlServer::~ControlServer(void) {
+using namespace std;
+
+namespace PlaQui {
+
+namespace Server {
+
+ControlServer::~ControlServer(void) {
 #ifdef DEBUG
-	std::cerr << __FILE__ << ": destructor." << std::endl;
+	cerr << __FILE__ << ": destructor." << endl;
 #endif // DEBUG
 }
 
-PlaQui::Server::ControlServer::ControlServer(const sockbuf::sockdesc& sd):
-		PlaQui::Server::ServerConnection(sd) {
+ControlServer::ControlServer(const sockbuf::sockdesc& sd):
+		Connection(sd) {
 #ifdef DEBUG
-	std::cerr << __FILE__ << ": sd = " << sd.sock << std::endl;
+	cerr << __FILE__ << ": sd = " << sd.sock << endl;
 #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) {
-		Request request;
+		Command command;
+		try {
+			//Glib::Mutex::Lock lock(socket_mutex);
+			socket >> command;
+		// Si se cerró el socket.
+		} catch (const ios::failure& e) {
+			stop = true;
+			continue;
+		// 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.
+		// 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;
-		while (!stop && socket.getline(buf, BUFFER_SIZE)) {
+		while (!stop && socket.getline(buf, BUFSIZ)) {
 #ifdef DEBUG
-			std::cerr << "Recibiendo linea: " << buf << std::endl;
+			cerr << __FILE__ << "  Recibiendo inea: " << buf << endl;
 #endif // DEBUG
 			int len = strlen(buf);
 			// Si tiene un retorno de carro, lo elimina.
@@ -84,57 +117,80 @@ void PlaQui::Server::ControlServer::real_run(void) {
 				// 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()));
+*/
 #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 << __FILE__ << " : real_run() Despachando comando: target = "
+			<< command.get_target() << " | command = " << command.get_command()
+			<< " | args = [" << String::join(command.get_args(), ", ") << "]"
+			<< endl;
 #endif // DEBUG
+		// Manda el comando.
+		command_received(command);
 		// FIXME - hacer respuesta XML.
-		stringstream response_xml;
-		socket << "HTTP/1.0 200 OK" << std::endl;
+		// 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;
 /*
 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
 */
-		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++) {
-			response_xml << "           <li><b>" << i->first << ":</b> "
-				<< i->second << std::endl;
+/*
+		socket << "Content-Type: text/html; charset=iso-8859-1" << endl;
+		response_xml << "<html>" << endl;
+		response_xml << "    <head>" << endl;
+		response_xml << "        <title>PlaQui v0.4</title>" << endl;
+		response_xml << "    </head>" << endl;
+		response_xml << "    <body>" << endl;
+		response_xml << "        <h1>PlaQui</h1>" << endl;
+		response_xml << "        <p>versión 0.4</p>" << endl;
+		response_xml << "        <h2>Comando</h2>" << endl;
+		response_xml << "        <ul>" << 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 << "               <ol>" << endl;
+		for (Command::Arguments::const_iterator i = command.get_args().begin();
+				i != command.get_args().end(); i++) {
+			response_xml << "                   <li>" << *i << "</li>" << 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 << "               </ol>" << endl;
+		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;
+*/
 	}
 }
 
+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
+