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

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index 6a33e32..15b576e 100644
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -39,26 +39,41 @@ 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);
 }
 
-ControlClient::ControlClient(string host, int port):
-		Connection(sockbuf::sock_stream) {
+ControlClient::ControlClient(const string& _host,
+		const Connection::Port& _port) throw(sockerr):
+		Connection(sockbuf::sock_stream, _host, _port) {
 #ifdef DEBUG
-	cerr << __FILE__ << ": host = " << host
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": host = " << host
 		<< " | port = " << port << endl;
 #endif // DEBUG
 	socket->connect(host.c_str(), port);
-	//if (!socket->is_open()) {
-	//	throw ios::failure("Can't connect!");
-	//}
+	host = socket->localhost();
+	port = socket->localport();
 }
 
 void ControlClient::real_run(void) {
 #ifdef DEBUG
-	cerr << __FILE__ << ": real_run." << endl;
+	cerr << __FILE__ << "(" << __LINE__ << ")"
+		<< ": real_run." << 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;
 		try {
@@ -66,28 +81,50 @@ void ControlClient::real_run(void) {
 			socket >> response;
 		// Si se cerró el socket.
 		} catch (const ios::failure& e) {
-			stop = true;
-			continue;
+			// TODO poner buenos codigos de error.
+			error(1000000, "Se desconectó.");
+			return;
+		} catch (const sockerr& e) {
+			error(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.
-			error_received();
+			// TODO - es un error recuperable? O manda señal error()?
+			error_received(e);
 			continue;
 		}
 		switch (response.status_code) {
 			case HTTPMessage::OK:
-				ok_received();
+				ok_received(response.get_body());
 				break;
 			default:
-				error_received();
+				error_received(response.status_code);
 				break;
 		}
 	}
 }
 
+void ControlClient::send(const Command& command) {
+	try {
+		socket << command << flush;
+	} catch (const sockerr& e) {
+		error(e.serrno(), e.errstr());
+		finish();
+	}
+#ifdef DEBUG
+	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;
 }
@@ -96,11 +133,12 @@ ControlClient::SignalErrorReceived& ControlClient::signal_error_received(void) {
 	return error_received;
 }
 
-void ControlClient::send(const Command& command) {
-	socket << command << flush;
-#ifdef DEBUG
-	cerr << __FILE__ << ": send() Enviado!" << endl;
-#endif // DEBUG
+// TODO - temporal
+Receiver::SignalFrameReceived& ControlClient::signal_frame_received(void) {
+	// 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