X-Git-Url: https://git.llucax.com/z.facultad/75.42/plaqui.git/blobdiff_plain/71586a11d38b52295c9fb1884d4010adf6dd23b0..0d72fb12dc9a570be45e2f25320ac49f604c3ed2:/Server/src/controlclient.cpp

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index b26385c..48ef328 100644
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -41,10 +41,12 @@ ControlClient::~ControlClient(void) {
 #ifdef DEBUG
 	cerr << __FILE__ << ": destructor." << endl;
 #endif // DEBUG
+	// TODO Temporal: espero que el receiver muera.
+	receiver.finish(true);
 }
 
-ControlClient::ControlClient(string host, int port):
-		Connection(sockbuf::sock_stream), host(host), port(port) {
+ControlClient::ControlClient(const string& host, const Connection::Port& port):
+		Connection(sockbuf::sock_stream, host, port) {
 #ifdef DEBUG
 	cerr << __FILE__ << ": host = " << host
 		<< " | port = " << port << endl;
@@ -55,15 +57,20 @@ void ControlClient::real_run(void) {
 #ifdef DEBUG
 	cerr << __FILE__ << ": real_run." << endl;
 #endif // DEBUG
-	socket->connect(host.c_str(), port);
-	// TODO - mejorar manejo de errores de conexion.
-	// volver a poner signal_disconnected()? reciclar signal_error_received()
-	// y/o llamarla signal_error()?
-	if (false) {
+	try {
+		socket->connect(host.c_str(), port);
+	} catch (const sockerr& e) {
+		// Poner una señal de error específica?
+		error_received(1);
 		finish();
-	} else {
-		connected();
+		return;
 	}
+	host = socket->localhost();
+	port = socket->localport();
+	// TODO sacar signal_connected?
+	connected();
+	// TODO Temporal: el receiver empieza a escuchar.
+	receiver.run();
 	while (!stop) {
 		HTTPResponse response;
 		try {
@@ -84,7 +91,7 @@ void ControlClient::real_run(void) {
 		}
 		switch (response.status_code) {
 			case HTTPMessage::OK:
-				ok_received();
+				ok_received(response.get_body());
 				break;
 			default:
 				error_received(response.status_code);
@@ -112,6 +119,11 @@ ControlClient::SignalErrorReceived& ControlClient::signal_error_received(void) {
 	return error_received;
 }
 
+// TODO - temporal
+Receiver::SignalFrameReceived& ControlClient::signal_frame_received(void) {
+	return receiver.signal_frame_received();
+}
+
 } // namespace Server
 
 } // namespace PlaQui