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

diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp
index 4b88849..966e362 100644
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -25,44 +25,89 @@
 // $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"
+#ifdef DEBUG
+#	include "plaqui/server/string.h"
+#	include <iostream>
+#endif // DEBUG
+
+using namespace std;
 
-using namespace Plaqui;
+namespace PlaQui {
+
+namespace Server {
+
+ControlServer::~ControlServer(void) {
+#ifdef DEBUG
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": destructor." << endl;
+#endif // DEBUG
+}
 
 ControlServer::ControlServer(const sockbuf::sockdesc& sd):
 		Connection(sd) {
 #ifdef DEBUG
-	std::cerr << __FILE__ << ": sd = " << sd.sock << std::endl;
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": 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];
-	while (!stop) {
-		stringstream sstr;
-		while (!stop && socket.getline(buf, BUFFER_SIZE)) {
+void ControlServer::real_run(void) throw() {
+#ifdef DEBUG
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": real_run()" << endl;
+#endif // DEBUG
+	while (!stop()) {
+		Command command;
+		try {
+			socket >> command;
+		} catch (const ios::failure& e) {
+			// TODO poner buenos codigos de error.
+			signal_error().emit(200000, "Se desconectó.");
+			return;
+		} catch (const sockerr& e) {
+			signal_error().emit(e.serrno(), e.errstr());
+			return;
+		// Si hay un error al parsear el comando, se envia una respuesta con el
+		// error.
+		} catch (const HTTPError& e) {
 #ifdef DEBUG
-			std::cerr << "Reciviendo: " << buf << std::endl;
+			cerr << __FILE__ << "(" << __LINE__ << ")"
+				<< " : real_run() ERROR: status_code = "
+				<< e.code << " | reason = " << HTTPMessage::reason(e.code)
+				<< " | desc = " << e.what() << endl;
 #endif // DEBUG
-			// Si tiene contenido, lo almaceno en el buffer de comandos.
-			if (strlen(buf)) {
-				sstr << buf << endl;
-			// Si viene la línea vacía, terminan las cabeceras HTTP.
-			} else {
-				stop = true;
-			}
+			socket << HTTPResponse(e) << flush;
+			continue;
 		}
-		// Manda mensaje a la planta.
-		//dispatch_command(parse_command(sstr.str()));
 #ifdef DEBUG
-			std::cerr << "Recivido:" << std::endl << sstr.str() << std::endl;
+		cerr << __FILE__ << "(" << __LINE__ << ")"
+			<< " : real_run() Despachando comando: target = "
+			<< command.get_target() << " | command = " << command.get_command()
+			<< " | args = [" << String::join(command.get_args(), ", ") << "]"
+			<< endl;
 #endif // DEBUG
-		// FIXME - hacer respuesta XML.
-		socket << "Ok!" << std::endl;
+		// Manda el comando.
+		command_received(command);
 	}
 }
 
+void ControlServer::send(const Response& response) {
+	socket << response << flush;
+#ifdef DEBUG
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": send() Enviado!" << endl;
+#endif // DEBUG
+}
+
+ControlServer::SignalCommandReceived& ControlServer::signal_command_received(void) {
+	return command_received;
+}
+
+} // namespace Server
+
+} // namespace PlaQui
+