Se termina de migrar lo que habia hecho al nuevo modelo cliente-servidor, pero

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

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index 7138b44f09820ef5005dd0fe4b9bbc3ab77b74c9..99c5348ff9821f555b1f9d375e5539fd9bdbd357 100644 (file)
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -26,18 +26,31 @@
 //
 
 #include "plaqui/server/controlclient.h"
 //
 
 #include "plaqui/server/controlclient.h"

-// XXX
-#include <iostream>
+#ifdef DEBUG
+#      include <iostream>
+#endif // DEBUG

 
 

-using namespace PlaQui::Server;
+PlaQui::Server::ControlClient::~ControlClient(void) {
+#ifdef DEBUG
+       std::cerr << __FILE__ << ": destructor." << std::endl;
+#endif // DEBUG
+}

 
 

-ControlClient::ControlClient(std::string host, int port):
+PlaQui::Server::ControlClient::ControlClient(std::string host, int port):

                Connection(sockbuf::sock_stream) {
                Connection(sockbuf::sock_stream) {

+#ifdef DEBUG
+       std::cerr << __FILE__ << ": host" << host
+               << " | port = " << port << std::endl;
+#endif // DEBUG

        // FIXME - poner en run().
        socket->connect(host.c_str(), port);
 }
 
        // FIXME - poner en run().
        socket->connect(host.c_str(), port);
 }
 

-void ControlClient::real_run(void) {
+void PlaQui::Server::ControlClient::real_run(void) {
+#ifdef DEBUG
+       std::cerr << __FILE__ << ": real_run." << std::endl;
+#endif // DEBUG
+#ifdef DEBUG

        // FIXME - debería tirar una excepción?
        if (!socket->is_open()) {
                std::cerr << "No se pudo conectar a " << socket->peerhost() <<
        // FIXME - debería tirar una excepción?
        if (!socket->is_open()) {
                std::cerr << "No se pudo conectar a " << socket->peerhost() <<


@@ -45,6 +58,7 @@ void ControlClient::real_run(void) {
        } else {
                std::cerr << "Conectado a " << socket->peerhost() <<
                        ":" << socket->peerport() << "." << std::endl;
        } else {
                std::cerr << "Conectado a " << socket->peerhost() <<
                        ":" << socket->peerport() << "." << std::endl;

+#endif // DEBUG

        }
 }
 
        }
 }