X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/f27c218d18ebf7198e07249aca1eed625da914fd..HEAD:/Server/src/controlserver.cpp

diff --git a/Server/src/controlserver.cpp b/Server/src/controlserver.cpp
index f5c6c73..a8baf50 100644
--- a/Server/src/controlserver.cpp
+++ b/Server/src/controlserver.cpp
@@ -29,8 +29,6 @@
 #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>
@@ -44,142 +42,77 @@ namespace Server {
 
 ControlServer::~ControlServer(void) {
 #ifdef DEBUG
-	cerr << __FILE__ << ": destructor." << endl;
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": destructor." << endl;
 #endif // DEBUG
 }
 
 ControlServer::ControlServer(const sockbuf::sockdesc& sd):
 		Connection(sd) {
 #ifdef DEBUG
-	cerr << __FILE__ << ": sd = " << sd.sock << endl;
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": sd = " << sd.sock << endl;
 #endif // DEBUG
 }
 
-void ControlServer::real_run(void) {
+void ControlServer::real_run(void) throw() {
 #ifdef DEBUG
-	cerr << __FILE__ << ": real_run()" << endl;
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": real_run()" << endl;
 #endif // DEBUG
-	//char buf[BUFSIZ];
-	while (!stop) {
+	while (!stop()) {
 		Command command;
 		try {
-			Glib::Mutex::Lock lock(socket_mutex);
 			socket >> command;
-		// Si se cerró el socket.
 		} catch (const ios::failure& e) {
-			stop = true;
-			continue;
+			// 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
-			cerr << __FILE__ << " : real_run() ERROR: status_code = "
+			cerr << __FILE__ << "(" << __LINE__ << ")"
+				<< " : real_run() ERROR: status_code = "
 				<< e.code << " | reason = " << HTTPMessage::reason(e.code)
 				<< " | desc = " << e.what() << endl;
 #endif // DEBUG
 			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';
-			}
-			// Si tiene contenido, lo agrego a la información del request.
-			if (len) {
-				// 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 {
-				// 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.
-			}
-		}
-*/
 #ifdef DEBUG
-		cerr << __FILE__ << " : real_run() Despachando comando: target = "
+		cerr << __FILE__ << "(" << __LINE__ << ")"
+			<< " : 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.
-		// 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
-Accept-Ranges: bytes
-*/
-/*
-		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;
+void ControlServer::send(const Response& response) {
+	try {
+		socket << response << flush;
+	} catch (const sockerr& e) {
+		cerr << __FILE__ << "(" << __LINE__ << ") send(): "
+			<< "Socket Error: " << e.operation() << " | serrno = "
+			<< e.serrno() << " | errstr = " << e.errstr() << endl;
+	} catch (const exception& e) {
+		cerr << __FILE__ << "(" << __LINE__ << ") send(): "
+			<< "Error: " << e.what() << endl;
+	} catch (...) {
+		cerr << __FILE__ << "(" << __LINE__ << ") send(): "
+			<< "Error DESCONOCIDO!!!!!!!!" << endl;
+	}
+#ifdef DEBUG
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": send() Enviado!" << endl;
+#endif // DEBUG
 }
 
 ControlServer::SignalCommandReceived& ControlServer::signal_command_received(void) {