X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/561dba59a06d7f7cc5614b1648484e439aebb771..dafb509182bac9b314202fe7dfaf58206da5ccbe:/Server/src/controlclient.cpp?ds=sidebyside

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index e744d0d..ac8886a 100644
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -25,7 +25,7 @@
 // $Id$
 //
 
-#include "plaqui/server/httpresponse.h"
+#include "plaqui/server/response.h"
 #include "plaqui/server/controlclient.h"
 #ifdef DEBUG
 #	include <iostream>
@@ -43,50 +43,46 @@ ControlClient::~ControlClient(void) {
 		<< ": destructor." << endl;
 #endif // DEBUG
 	// TODO Temporal: espero que el receiver muera.
-	receiver->finish(true);
+	// Conectar señal on_receiver_finished() y esperar a que el puntero sea
+	// NULL para saber que terminó.
+	receiver->finish();
 }
 
 ControlClient::ControlClient(const string& _host,
 		const Connection::Port& _port) throw(sockerr):
 		Connection(sockbuf::sock_stream, _host, _port) {
+	socket->connect(host.c_str(), port);
+	host = socket->localhost();
+	port = socket->localport();
 #ifdef DEBUG
 	cerr << __FILE__ << "(" << __LINE__ << ")"
 		<< ": host = " << host
 		<< " | port = " << port << endl;
 #endif // DEBUG
-	socket->connect(host.c_str(), port);
-	host = socket->localhost();
-	port = socket->localport();
 	receiver = new Receiver(7528, host);
 }
 
-void ControlClient::real_run(void) {
+void ControlClient::real_run(void) throw() {
 #ifdef DEBUG
 	cerr << __FILE__ << "(" << __LINE__ << ")"
 		<< ": real_run." << endl;
+	cerr << ": REAL | host = " << host
+		<< " | port = " << port << endl;
 #endif // DEBUG
-	try {
-	} catch (const sockerr& e) {
-		// TODO Poner una señal de error específica?
-		error(e.serrno(), e.errstr());
-		return;
-	}
-	// TODO sacar signal_connected?
-	connected();
 	// TODO Temporal: el receiver empieza a escuchar.
 	receiver->run();
-	while (!stop) {
-		HTTPResponse response;
+	while (!stop()) {
+		Response response;
 		try {
 			//Glib::Mutex::Lock lock(socket_mutex);
 			socket >> response;
 		// Si se cerró el socket.
 		} catch (const ios::failure& e) {
 			// TODO poner buenos codigos de error.
-			error(1000000, "Se desconectó.");
+			signal_error().emit(1000000, "Se desconectó.");
 			return;
 		} catch (const sockerr& e) {
-			error(e.serrno(), e.errstr());
+			signal_error().emit(e.serrno(), e.errstr());
 			return;
 		// Si hay un error al parsear la respuesta.
 		} catch (const HTTPResponse::Error& e) {
@@ -98,12 +94,12 @@ void ControlClient::real_run(void) {
 			error_received(e);
 			continue;
 		}
-		switch (response.status_code) {
-			case HTTPMessage::OK:
-				ok_received(response.get_body());
+		switch (response.xml_code) {
+			case Response::OK:
+				ok_received(response.xml_body);
 				break;
 			default:
-				error_received(response.status_code);
+				error_received(response.xml_code);
 				break;
 		}
 	}
@@ -113,7 +109,7 @@ void ControlClient::send(const Command& command) {
 	try {
 		socket << command << flush;
 	} catch (const sockerr& e) {
-		error(e.serrno(), e.errstr());
+		signal_error().emit(e.serrno(), e.errstr());
 		finish();
 	}
 #ifdef DEBUG
@@ -122,10 +118,6 @@ void ControlClient::send(const Command& command) {
 #endif // DEBUG
 }
 
-ControlClient::SignalConnected& ControlClient::signal_connected(void) {
-	return connected;
-}
-
 ControlClient::SignalOKReceived& ControlClient::signal_ok_received(void) {
 	return ok_received;
 }