Refactor IPv6/IPv4 handling and console echo logic

ryihan · ryihan · commit 0882e7514eab · 2025-08-10T03:52:17.000+06:00
Updated IPv6 to IPv4 conversion to avoid deprecated Boost methods and implemented manual byte extraction. Refactored console echo functions to use termios on non-Windows platforms and added stubs for Windows, improving cross-platform compatibility.
diff --git a/src/config/utilities.cpp b/src/config/utilities.cpp
@@ -139,12 +139,24 @@ BC_POP_WARNING()
 // asio/asio conversions.
 // ----------------------------------------------------------------------------
 
-inline bool is_embedded_v4(const boost::asio::ip::address_v6& ip6) NOEXCEPT
+bool is_embedded_v4(const boost::asio::ip::address_v6& ip6)
 {
-    BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
-    // is_v4_compatible is deprecated, removed in 1.87, no replacement.
-    return ip6.is_v4_mapped() || ip6.is_v4_compatible();
-    BC_POP_WARNING()
+    // Still works in Boost ≥ 1.70
+    if (ip6.is_v4_mapped())
+        return true;
+
+    // Replacement for removed is_v4_compatible()
+    auto bytes = ip6.to_bytes();
+    bool compatible = true;
+    for (size_t i = 0; i < 12; ++i)
+    {
+        if (bytes[i] != 0)
+        {
+            compatible = false;
+            break;
+        }
+    }
+    return compatible;
 }
 
 // Convert IPv6-mapped to IPV4 (ensures consistent internal matching).
@@ -157,8 +169,10 @@ asio::address denormalize(const asio::address& ip) NOEXCEPT
         {
             const auto ip6 = ip.to_v6();
 
-            // to_v4 is deprecated, removed in 1.87, no replacement.
-            if (is_embedded_v4(ip6)) return { ip6.to_v4() };
+           auto bytes = ip6.to_bytes();
+std::array<unsigned char, 4> v4bytes;
+std::copy(bytes.begin() + 12, bytes.end(), v4bytes.begin());
+return boost::asio::ip::address_v4(v4bytes);
         }
         catch (const std::exception&)
         {
@@ -171,20 +185,23 @@ asio::address denormalize(const asio::address& ip) NOEXCEPT
 // asio/string host conversions.
 // ----------------------------------------------------------------------------
 
-inline std::string to_host(const boost::asio::ip::address_v6& ip6) NOEXCEPT
+std::string to_host(const boost::asio::ip::address_v6& ip6)
 {
-    try
+    if (is_embedded_v4(ip6))
     {
-        BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
-        return is_embedded_v4(ip6) ? to_host(ip6.to_v4()) : ip6.to_string();
-        BC_POP_WARNING()
+        auto bytes = ip6.to_bytes();
+        std::array<unsigned char, 4> v4bytes;
+        std::copy(bytes.begin() + 12, bytes.end(), v4bytes.begin());
+        boost::asio::ip::address_v4 v4addr(v4bytes);
+        return to_host(v4addr);
     }
-    catch (const std::exception&)
+    else
     {
-        return { "::" };
+        return ip6.to_string();
     }
 }
 
+
 inline std::string to_host(const boost::asio::ip::address_v4& ip4) NOEXCEPT
 {
     try
diff --git a/src/unicode/utf8_everywhere/stdio.cpp b/src/unicode/utf8_everywhere/stdio.cpp
@@ -17,13 +17,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include <bitcoin/system/unicode/utf8_everywhere/stdio.hpp>
-
+#include <windows.h>
 #ifdef HAVE_MSC
     #include <fcntl.h>
     #include <io.h>
     #include <windows.h>
 #else
-    #include <termios.h>
+   #if !defined(_WIN32)
+#include <termios.h>
+#endif
 #endif
 #include <mutex>
 #include <bitcoin/system/define.hpp>
@@ -80,21 +82,28 @@ inline void set_binary_stdio(FILE* file) THROWS
         throw runtime_exception{ "Could not set STDIO to binary mode." };
 }
 
-void set_console_echo() NOEXCEPT
-{
-    const auto handle = GetStdHandle(STD_INPUT_HANDLE);
-    DWORD mode{};
-    GetConsoleMode(handle, &mode);
-    SetConsoleMode(handle, mode | ENABLE_ECHO_INPUT);
+#ifndef _WIN32
+void set_console_echo() {
+    termios terminal{};
+    tcgetattr(0, &terminal);
+    terminal.c_lflag |= ECHO;
+    tcsetattr(STDIN_FILENO, TCSAFLUSH, &terminal);
 }
 
-void unset_console_echo() NOEXCEPT
-{
-    const auto handle = GetStdHandle(STD_INPUT_HANDLE);
-    DWORD mode{};
-    GetConsoleMode(handle, &mode);
-    SetConsoleMode(handle, mode & ~ENABLE_ECHO_INPUT);
+void unset_console_echo() {
+    termios terminal{};
+    tcgetattr(0, &terminal);
+    terminal.c_lflag &= ~ECHO;
+    tcsetattr(STDIN_FILENO, TCSAFLUSH, &terminal);
+}
+#else
+void set_console_echo() {
+    // TODO: Windows console echo handling if needed
 }
+void unset_console_echo() {
+    // TODO: Windows console echo handling if needed
+}
+#endif
 
 #else // HAVE_MSC
 
@@ -104,21 +113,28 @@ std::ostream& cerr_stream() THROWS {  return std::cerr; }
 inline void set_utf8_stdio(FILE*) THROWS {}
 inline void set_binary_stdio(FILE*) THROWS {}
 
-void set_console_echo() NOEXCEPT
-{
+#ifndef _WIN32
+void set_console_echo() {
     termios terminal{};
     tcgetattr(0, &terminal);
     terminal.c_lflag |= ECHO;
     tcsetattr(STDIN_FILENO, TCSAFLUSH, &terminal);
 }
 
-void unset_console_echo() NOEXCEPT
-{
+void unset_console_echo() {
     termios terminal{};
     tcgetattr(0, &terminal);
     terminal.c_lflag &= ~ECHO;
     tcsetattr(STDIN_FILENO, TCSAFLUSH, &terminal);
 }
+#else
+void set_console_echo() {
+    // TODO: Windows console echo handling if needed
+}
+void unset_console_echo() {
+    // TODO: Windows console echo handling if needed
+}
+#endif
 
 #endif // HAVE_MSC
 
