[STR-3621] Save last successful address

arvial981 · arvial981 · commit 948ae2580a72 · 2025-02-13T18:09:51.000+03:00
diff --git a/Socket/TCPClient.cpp b/Socket/TCPClient.cpp
@@ -319,34 +319,37 @@ bool CTCPClient::Connect(const std::string& strServer, const std::string& strPor
    {
       // create socket
       m_ConnectSocket = socket(pResPtr->ai_family, pResPtr->ai_socktype, pResPtr->ai_protocol);
-      if (m_ConnectSocket < 0) // or == -1
-         continue;
-
-      // connexion to the server
-      const auto ConnectionTimeBegin = std::chrono::steady_clock::now();
-      int iConRet = connect(m_ConnectSocket, pResPtr->ai_addr, pResPtr->ai_addrlen);
-      const auto ConnectionTimeEnd = std::chrono::steady_clock::now();
-      if (iConRet >= 0) // or != -1
+      if (m_ConnectSocket >= 0)
       {
-         /* Success */
-         m_eStatus = CONNECTED;
-
-         if (m_eSettingsFlags & ENABLE_LOG)
-         {
-            const auto TimeElapsed =
-                std::chrono::duration_cast<std::chrono::milliseconds>(ConnectionTimeEnd - ConnectionTimeBegin).count();
-            m_oLog(StringFormat(
-                "[TCPClient][Info] Successfully connected to address %s at index %d. Connection took %d ms",
-                SockAddrToString(pResPtr->ai_addr).data(), uTmpIndex, TimeElapsed));
-         }
-
-         if (m_pResultAddrInfo != nullptr)
+         // connexion to the server
+         const auto ConnectionTimeBegin = std::chrono::steady_clock::now();
+         int iConRet = connect(m_ConnectSocket, pResPtr->ai_addr, pResPtr->ai_addrlen);
+         const auto ConnectionTimeEnd = std::chrono::steady_clock::now();
+         if (iConRet >= 0) // or != -1
          {
-            freeaddrinfo(m_pResultAddrInfo);
-            m_pResultAddrInfo = nullptr;
+            /* Success */
+            m_eStatus = CONNECTED;
+
+            m_strLastAddress = SockAddrToString(pResPtr->ai_addr);
+            if (m_eSettingsFlags & ENABLE_LOG)
+            {
+               const auto TimeElapsed =
+                   std::chrono::duration_cast<std::chrono::milliseconds>(ConnectionTimeEnd - ConnectionTimeBegin)
+                       .count();
+
+               m_oLog(StringFormat(
+                   "[TCPClient][Info] Successfully connected to address %s at index %d. Connection took %d ms",
+                   m_strLastAddress.data(), uTmpIndex, TimeElapsed));
+            }
+
+            if (m_pResultAddrInfo != nullptr)
+            {
+               freeaddrinfo(m_pResultAddrInfo);
+               m_pResultAddrInfo = nullptr;
+            }
+
+            return true;
          }
-
-         return true;
       }
 
       if (m_eSettingsFlags & ENABLE_LOG)
diff --git a/Socket/TCPClient.h b/Socket/TCPClient.h
@@ -71,6 +71,8 @@ class CTCPClient : public ASocket
 
    Socket GetSocketDescriptor() const { return m_ConnectSocket; }
 
+   std::string GetLastAddress() const { return m_strLastAddress; }
+
 protected:
    enum SocketStatus
    {
@@ -87,6 +89,7 @@ class CTCPClient : public ASocket
    struct addrinfo  m_HintsAddrInfo;
    std::random_device m_RandDevice{};
    std::default_random_engine m_Rng;
+   std::string m_strLastAddress;
 };
 
 #endif
