X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/1eadf77f99288a079f330d14feb6e81dac906cd3..bcbe297964b0ad7393385f1dd240448c340ed5ed:/Server/src/controlserver.cpp?ds=sidebyside

diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp
index 6ac3a77..32d3306 100644
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -25,88 +25,172 @@
 // $Id$
 //
 
-#include "controlserver.h"
-#include <cstring>
-#include <sstream>
+#include "plaqui/server/controlserver.h"
+#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
+
+using namespace std;
+
+namespace PlaQui {
 
-using namespace Plaqui;
+namespace Server {
+
+ControlServer::~ControlServer(void) {
+#ifdef DEBUG
+	cerr << __FILE__ << ": destructor." << endl;
+#endif // DEBUG
+}
 
 ControlServer::ControlServer(const sockbuf::sockdesc& sd):
 		Connection(sd) {
 #ifdef DEBUG
-	std::cerr << "Compilado el " << __DATE__ << std::endl;
-	std::cerr << __FILE__ << ": sd = " << sd.sock << std::endl;
+	cerr << __FILE__ << ": sd = " << sd.sock << endl;
 #endif // DEBUG
 }
 
 void ControlServer::real_run(void) {
-	// FIXME se tiene que ir a la clase para poder frenarlo desde afuera.
-	bool stop = false;
-	char buf[BUFFER_SIZE];
+#ifdef DEBUG
+	cerr << __FILE__ << ": real_run()" << endl;
+#endif // DEBUG
+	//char buf[BUFSIZ];
 	while (!stop) {
-		stringstream sstr;
-		while (!stop && socket.getline(buf, BUFFER_SIZE)) {
+		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
-			std::cerr << "Reciviendo (crudo): " << buf << std::endl;
+			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, BUFSIZ)) {
+#ifdef DEBUG
+			cerr << __FILE__ << "  Recibiendo inea: " << buf << endl;
 #endif // DEBUG
 			int len = strlen(buf);
 			// Si tiene un retorno de carro, lo elimina.
 			if (len && (buf[len-1] == '\r')) {
 				buf[--len] = '\0';
 			}
-#ifdef DEBUG
-			std::cerr << "Reciviendo (sin \\r): " << buf << std::endl;
-			std::cerr << "len: " << len << std::endl;
-			if (len == 1) {
-				std::cerr << std::hex << "Caracter: " << *buf << std::endl;
-			}
-#endif // DEBUG
-			// Si tiene contenido, lo almaceno en el buffer de comandos.
+			// Si tiene contenido, lo agrego a la información del request.
 			if (len) {
-				sstr << buf << endl;
-			// Si viene la línea vacía, terminan las cabeceras HTTP.
+				// Si es la primera línea, es el request.
+				if (is_first) {
+					request.set_request(buf, socket->peerhost(),
+							socket->peerport());
+					is_first = false;
+				} else {
+					// TODO request.parse_header(buf);
+				}
+			// Si viene la línea vacía
 			} else {
-				stop = true;
+				// Si no es la primera, terminan las cabeceras HTTP.
+				if (!is_first) {
+					// Podría ir un break.
+					stop = true;
+					continue;
+				}
+				// Si es la primera, no pasa nada, sigue esperando un request.
 			}
 		}
-		// Manda mensaje a la planta.
-		//dispatch_command(parse_command(sstr.str()));
+*/
 #ifdef DEBUG
-		std::cerr << "Recivido:" << std::endl << sstr.str() << 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.1</p>" << std::endl;
-		response_xml << "        <h3>Desarrollado por</h3>" << 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;
+/*
+		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 << "               </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
+