From 71522214aeb4ce811413256a2e3fea4900e119a5 Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Sun, 2 Jul 2017 01:36:33 +0300
Subject: [PATCH] Show resolved pool ip.

---
 CMakeLists.txt      | 2 +-
 src/net/Client.cpp  | 3 +++
 src/net/Client.h    | 2 ++
 src/net/Network.cpp | 6 +++---
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3026905e..6cc2f555 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,7 +122,7 @@ else()
 endif()
 
 add_definitions(/DUNICODE)
-add_definitions(/DAPP_DEBUG)
+#add_definitions(/DAPP_DEBUG)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
diff --git a/src/net/Client.cpp b/src/net/Client.cpp
index ffd72114..f709245a 100644
--- a/src/net/Client.cpp
+++ b/src/net/Client.cpp
@@ -50,6 +50,7 @@ Client::Client(int id, const char *agent, IClientListener *listener) :
     m_stream(nullptr),
     m_socket(nullptr)
 {
+    memset(m_ip, 0, sizeof(m_ip));
     m_resolver.data = m_responseTimer.data = m_retriesTimer.data = m_keepAliveTimer.data = this;
 
     m_hints.ai_family   = PF_INET;
@@ -513,6 +514,8 @@ void Client::onResolved(uv_getaddrinfo_t *req, int status, struct addrinfo *res)
         return client->reconnect();;
     }
 
+    uv_ip4_name(reinterpret_cast<sockaddr_in*>(res->ai_addr), client->m_ip, 16);
+
     client->connect(res->ai_addr);
     uv_freeaddrinfo(res);
 }
diff --git a/src/net/Client.h b/src/net/Client.h
index 29571830..d8bb785a 100644
--- a/src/net/Client.h
+++ b/src/net/Client.h
@@ -63,6 +63,7 @@ public:
 
     inline bool isReady() const              { return m_state == ConnectedState && m_failures == 0; }
     inline const char *host() const          { return m_url.host(); }
+    inline const char *ip() const            { return m_ip; }
     inline const Job &job() const            { return m_job; }
     inline int id() const                    { return m_id; }
     inline SocketState state() const         { return m_state; }
@@ -96,6 +97,7 @@ private:
     static Client *getClient(void *data);
 
     bool m_quiet;
+    char m_ip[17];
     char m_rpcId[64];
     const char *m_agent;
     IClientListener *m_listener;
diff --git a/src/net/Network.cpp b/src/net/Network.cpp
index abd7ed11..5b204734 100644
--- a/src/net/Network.cpp
+++ b/src/net/Network.cpp
@@ -78,7 +78,7 @@ void Network::onActive(Client *client)
         return;
     }
 
-    LOG_INFO(m_options->colors() ? "\x1B[01;37muse pool: \x1B[01;36m%s:%d" : "use pool: %s:%d", client->host(), client->port());
+    LOG_INFO(m_options->colors() ? "\x1B[01;37muse pool \x1B[01;36m%s:%d \x1B[01;30m%s" : "use pool %s:%d %s", client->host(), client->port(), client->ip());
 }
 
 
@@ -121,11 +121,11 @@ void Network::onPause(IStrategy *strategy)
 void Network::setJob(Client *client, const Job &job)
 {
     if (m_options->colors()) {
-        LOG_INFO("\x1B[01;35mnew job\x1B[0m from \x1B[01;37m%s:%d\x1B[0m diff: \x1B[01;37m%d", client->host(), client->port(), job.diff());
+        LOG_INFO("\x1B[01;35mnew job\x1B[0m from \x1B[01;37m%s:%d\x1B[0m diff \x1B[01;37m%d", client->host(), client->port(), job.diff());
 
     }
     else {
-        LOG_INFO("new job from %s:%d diff: %d", client->host(), client->port(), job.diff());
+        LOG_INFO("new job from %s:%d diff %d", client->host(), client->port(), job.diff());
     }
 
     Workers::setJob(job);