Se corrige bug reportado por ricky.

[z.facultad/75.42/plaqui.git] / Server / src / controlclient.cpp

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index 62e693ebc3c86fb101cdff5a7afdf52b4ffd0df9..6a33e32f5a1ddd6c44a5005024d423deff2b8d9b 100644 (file)
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -25,26 +25,85 @@
 // $Id$
 //
 
+#include "plaqui/server/httpresponse.h"
 #include "plaqui/server/controlclient.h"
-// XXX
-#include <iostream>
+#ifdef DEBUG
+#      include <iostream>
+#endif // DEBUG
 
-using namespace Plaqui;
+using namespace std;
 
-ControlClient::ControlClient(std::string host, int port):
+namespace PlaQui {
+
+namespace Server {
+
+ControlClient::~ControlClient(void) {
+#ifdef DEBUG
+       cerr << __FILE__ << ": destructor." << endl;
+#endif // DEBUG
+}
+
+ControlClient::ControlClient(string host, int port):
                Connection(sockbuf::sock_stream) {
-       // FIXME - poner en run().
+#ifdef DEBUG
+       cerr << __FILE__ << ": host = " << host
+               << " | port = " << port << endl;
+#endif // DEBUG
        socket->connect(host.c_str(), port);
+       //if (!socket->is_open()) {
+       //      throw ios::failure("Can't connect!");
+       //}
 }
 
 void ControlClient::real_run(void) {
-       // FIXME - debería tirar una excepción?
-       if (!socket->is_open()) {
-               std::cerr << "No se pudo conectar a " << socket->peerhost() <<
-                       ":" << socket->peerport() << "." << std::endl;
-       } else {
-               std::cerr << "Conectado a " << socket->peerhost() <<
-                       ":" << socket->peerport() << "." << std::endl;
+#ifdef DEBUG
+       cerr << __FILE__ << ": real_run." << endl;
+#endif // DEBUG
+       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;
+               // Si hay un error al parsear la respuesta.
+               } catch (const HTTPResponse::Error& e) {
+#ifdef DEBUG
+                       cerr << __FILE__ << " : real_run() ERROR nro: " << e << endl;
+#endif // DEBUG
+                       // TODO - pasar como parametro codigo de error o algo.
+                       error_received();
+                       continue;
+               }
+               switch (response.status_code) {
+                       case HTTPMessage::OK:
+                               ok_received();
+                               break;
+                       default:
+                               error_received();
+                               break;
+               }
        }
 }
 
+ControlClient::SignalOKReceived& ControlClient::signal_ok_received(void) {
+       return ok_received;
+}
+
+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
+}
+
+} // namespace Server
+
+} // namespace PlaQui
+