- Se arregla el bug de ControlClient::get_host() y ControlClient::get_port().

- Se mejora Command::build().

diff --git a/Server/include/plaqui/server/connection.h b/Server/include/plaqui/server/connection.h
index 504875a317c471e4c346145b365efd5ae5f2098c..e20f22e4c7bf8c23cf1edb615bcd4066457ed51d 100644 (file)
--- a/Server/include/plaqui/server/connection.h
+++ b/Server/include/plaqui/server/connection.h
@@ -82,7 +82,8 @@ namespace Server {
                         *
                         * \param type Tipo de socket a usar.
                         */
-                       Connection(const sockbuf::type& type);
+                       Connection(const sockbuf::type& type, const std::string& host,
+                                       const Port& port);
 
                        /**
                         * Constructor.

diff --git a/Server/include/plaqui/server/controlclient.h b/Server/include/plaqui/server/controlclient.h
index 50ebe2aaf3b4f890cca0d8ebb7860d670b4d2a4c..669fba4593d8b4110fb470ec51bc23d10f0496d7 100644 (file)
--- a/Server/include/plaqui/server/controlclient.h
+++ b/Server/include/plaqui/server/controlclient.h
@@ -54,14 +54,6 @@ namespace Server {
 
                // Atributos.
 
-               private:
-
-                       /// Host al cual conectarse.
-                       std::string host;
-
-                       /// Puerto al cual conectarse.
-                       int port;
-
                protected:
 
                        /// Señal para indicar que se conectó.
@@ -96,7 +88,8 @@ namespace Server {
                         *                         control.
                         * \param port Puerto al cual conectarse.
                         */
-                       ControlClient(std::string host = "localhost", int port = 7522);
+                       ControlClient(const std::string& host = "localhost",
+                                       const Connection::Port& port = 7522);
 
                        /**
                         * Envía un comando al servidor.

diff --git a/Server/src/command.cpp b/Server/src/command.cpp
index 47a4a6030acfe67993913705edf02fb55416cb40..5087d9e783464e97adcd48170d9256a10178cefd 100644 (file)
--- a/Server/src/command.cpp
+++ b/Server/src/command.cpp
@@ -99,6 +99,10 @@ void Command::add_arg(const std::string& arg) {
 }
 
 void Command::add_arg(const unsigned& arg) {
+#ifdef DEBUG
+       cerr << __FILE__ << ": add_arg(arg = " << arg << ") = "
+               << String().from(arg) << endl;
+#endif // DEBUG
        args.push_back(String().from(arg));
        build();
 }

diff --git a/Server/src/connection.cpp b/Server/src/connection.cpp
index 1b328c643e0d71d51228edf11cef177e95685a25..a8f17ea3c2521d02a2a46c1d0046789d6e51a61f 100644 (file)
--- a/Server/src/connection.cpp
+++ b/Server/src/connection.cpp
@@ -55,10 +55,11 @@ Connection::Connection(const sockbuf::sockdesc& sd):
 #endif // DEBUG
 }
 
-Connection::Connection(const sockbuf::type& type):
-               socket(type) {
+Connection::Connection(const sockbuf::type& type, const std::string& host,
+               const Port& port): socket(type), host(host), port(port) {
 #ifdef DEBUG
-       cerr << __FILE__ << ": type = " << type << endl;
+       cerr << __FILE__ << ": type = " << type << " | host = " << host
+               << " | port = " << port << endl;
 #endif // DEBUG
 }
 

diff --git a/Server/src/controlclient.cpp b/Server/src/controlclient.cpp
index 07c86803346d4dbee1060e0fa3e76f8fa876dfc2..511def5841838757924cf4c225cec5361bbac97c 100644 (file)
--- a/Server/src/controlclient.cpp
+++ b/Server/src/controlclient.cpp
@@ -43,8 +43,8 @@ ControlClient::~ControlClient(void) {
 #endif // DEBUG
 }
 
-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;
@@ -63,8 +63,8 @@ void ControlClient::real_run(void) {
                finish();
                return;
        }
-       host = socket->peerhost();
-       port = socket->peerport();
+       host = socket->localhost();
+       port = socket->localport();
        // TODO sacar a la mierda?
        connected();
        while (!stop) {