X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/81fe1238505972c209c81f1c729ae910c275cfe9..9c0c758e9af50f624414decbaae43c04e8d8e3f9:/Server/src/controlclient.cpp?ds=sidebyside

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index 48ef328..130282d 100644
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -39,53 +39,58 @@ namespace Server {
 
 ControlClient::~ControlClient(void) {
 #ifdef DEBUG
-	cerr << __FILE__ << ": destructor." << endl;
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": 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):
-		Connection(sockbuf::sock_stream, host, port) {
+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__ << ": host = " << host
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": host = " << host
 		<< " | port = " << port << endl;
 #endif // DEBUG
+	receiver = new Receiver(7528, host);
 }
 
-void ControlClient::real_run(void) {
+void ControlClient::real_run(void) throw() {
 #ifdef DEBUG
-	cerr << __FILE__ << ": real_run." << endl;
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": real_run." << endl;
+	cerr << ": REAL | host = " << host
+		<< " | port = " << port << endl;
 #endif // DEBUG
-	try {
-		socket->connect(host.c_str(), port);
-	} catch (const sockerr& e) {
-		// Poner una señal de error específica?
-		error_received(1);
-		finish();
-		return;
-	}
-	host = socket->localhost();
-	port = socket->localport();
-	// TODO sacar signal_connected?
-	connected();
 	// TODO Temporal: el receiver empieza a escuchar.
-	receiver.run();
-	while (!stop) {
+	receiver->run();
+	while (!stop()) {
 		HTTPResponse response;
 		try {
 			//Glib::Mutex::Lock lock(socket_mutex);
 			socket >> response;
 		// Si se cerró el socket.
 		} catch (const ios::failure& e) {
-			stop = true;
-			continue;
+			// TODO poner buenos codigos de error.
+			signal_error().emit(1000000, "Se desconectó.");
+			return;
+		} catch (const sockerr& e) {
+			signal_error().emit(e.serrno(), e.errstr());
+			return;
 		// Si hay un error al parsear la respuesta.
 		} catch (const HTTPResponse::Error& e) {
 #ifdef DEBUG
-			cerr << __FILE__ << " : real_run() ERROR nro: " << e << endl;
+			cerr << __FILE__ << "(" << __LINE__ << ")"
+				<< " : real_run() ERROR nro: " << e << endl;
 #endif // DEBUG
-			// TODO - pasar como parametro codigo de error o algo.
+			// TODO - es un error recuperable? O manda señal error()?
 			error_received(e);
 			continue;
 		}
@@ -101,16 +106,18 @@ void ControlClient::real_run(void) {
 }
 
 void ControlClient::send(const Command& command) {
-	socket << command << flush;
+	try {
+		socket << command << flush;
+	} catch (const sockerr& e) {
+		signal_error().emit(e.serrno(), e.errstr());
+		finish();
+	}
 #ifdef DEBUG
-	cerr << __FILE__ << ": send() Enviado!" << endl;
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": send() Enviado!" << endl;
 #endif // DEBUG
 }
 
-ControlClient::SignalConnected& ControlClient::signal_connected(void) {
-	return connected;
-}
-
 ControlClient::SignalOKReceived& ControlClient::signal_ok_received(void) {
 	return ok_received;
 }
@@ -121,7 +128,10 @@ ControlClient::SignalErrorReceived& ControlClient::signal_error_received(void) {
 
 // TODO - temporal
 Receiver::SignalFrameReceived& ControlClient::signal_frame_received(void) {
-	return receiver.signal_frame_received();
+	// XXX - cuidado, esto puede dar quilombo si no esta protegido por un mutex,
+	// aunque no deberia porque la señal no es llamada hasta que no se empice
+	// la transmision y la señal se conecta antes de pedir la transmision.
+	return receiver->signal_frame_received();
 }
 
 } // namespace Server