Merge pull request #1713 from ryihan/master

evoskuil · web-flow · commit 1a2adb482818 · 2025-08-14T20:41:29.000-04:00
Refactor IPv6/IPv4 handling and console echo logic
diff --git a/src/config/utilities.cpp b/src/config/utilities.cpp
@@ -139,12 +139,26 @@ BC_POP_WARNING()
 // asio/asio conversions.
 // ----------------------------------------------------------------------------
 
-inline bool is_embedded_v4(const boost::asio::ip::address_v6& ip6) NOEXCEPT
+// address_v6.to_v4 removed in boost 1.87, no replacement.
+inline asio::address to_v4(const boost::asio::ip::address_v6& ip6) THROWS
 {
-    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()
+    // Required for equivalence with boost 1.86.
+    if (!ip6.is_v4_mapped())
+        throw std::exception{};
+
+    const auto bytes = ip6.to_bytes();
+    return
+    {
+        boost::asio::ip::address_v4
+        {
+            boost::asio::ip::address_v4::bytes_type
+            {
+                {
+                    bytes.at(12), bytes.at(13), bytes.at(14), bytes.at(15)
+                }
+            }
+        } 
+    };
 }
 
 // Convert IPv6-mapped to IPV4 (ensures consistent internal matching).
@@ -155,13 +169,11 @@ asio::address denormalize(const asio::address& ip) NOEXCEPT
     {
         try
         {
-            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() };
+            return { to_v4(ip.to_v6()) };
         }
         catch (const std::exception&)
         {
+            return ip;
         }
     }
 
@@ -176,7 +188,7 @@ inline std::string to_host(const boost::asio::ip::address_v6& ip6) NOEXCEPT
     try
     {
         BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
-        return is_embedded_v4(ip6) ? to_host(ip6.to_v4()) : ip6.to_string();
+        return ip6.is_v4_mapped() ? to_host(to_v4(ip6)) : ip6.to_string();
         BC_POP_WARNING()
     }
     catch (const std::exception&)
diff --git a/src/unicode/utf8_everywhere/stdio.cpp b/src/unicode/utf8_everywhere/stdio.cpp
@@ -86,6 +86,7 @@ void set_console_echo() NOEXCEPT
     DWORD mode{};
     GetConsoleMode(handle, &mode);
     SetConsoleMode(handle, mode | ENABLE_ECHO_INPUT);
+    FlushConsoleInputBuffer(handle);
 }
 
 void unset_console_echo() NOEXCEPT
@@ -94,6 +95,7 @@ void unset_console_echo() NOEXCEPT
     DWORD mode{};
     GetConsoleMode(handle, &mode);
     SetConsoleMode(handle, mode & ~ENABLE_ECHO_INPUT);
+    FlushConsoleInputBuffer(handle);
 }
 
 #else // HAVE_MSC

Original file line number	Diff line number	Diff line change
`@@ -139,12 +139,26 @@ BC_POP_WARNING()`
`139`	`139`	`// asio/asio conversions.`
`140`	`140`	`// ----------------------------------------------------------------------------`
`141`	`141`
`142`		`-inline bool is_embedded_v4(const boost::asio::ip::address_v6& ip6) NOEXCEPT`
	`142`	`+// address_v6.to_v4 removed in boost 1.87, no replacement.`
	`143`	`+inline asio::address to_v4(const boost::asio::ip::address_v6& ip6) THROWS`
`143`	`144`	`{`
`144`		`- BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)`
`145`		`- // is_v4_compatible is deprecated, removed in 1.87, no replacement.`
`146`		`- return ip6.is_v4_mapped() \|\| ip6.is_v4_compatible();`
`147`		`- BC_POP_WARNING()`
	`145`	`+ // Required for equivalence with boost 1.86.`
	`146`	`+ if (!ip6.is_v4_mapped())`
	`147`	`+ throw std::exception{};`
	`148`	`+`
	`149`	`+ const auto bytes = ip6.to_bytes();`
	`150`	`+ return`
	`151`	`+ {`
	`152`	`+ boost::asio::ip::address_v4`
	`153`	`+ {`
	`154`	`+ boost::asio::ip::address_v4::bytes_type`
	`155`	`+ {`
	`156`	`+ {`
	`157`	`+ bytes.at(12), bytes.at(13), bytes.at(14), bytes.at(15)`
	`158`	`+ }`
	`159`	`+ }`
	`160`	`+ }`
	`161`	`+ };`
`148`	`162`	`}`
`149`	`163`
`150`	`164`	`// Convert IPv6-mapped to IPV4 (ensures consistent internal matching).`
`@@ -155,13 +169,11 @@ asio::address denormalize(const asio::address& ip) NOEXCEPT`
`155`	`169`	`{`
`156`	`170`	`try`
`157`	`171`	`{`
`158`		`- const auto ip6 = ip.to_v6();`
`159`		`-`
`160`		`- // to_v4 is deprecated, removed in 1.87, no replacement.`
`161`		`- if (is_embedded_v4(ip6)) return { ip6.to_v4() };`
	`172`	`+ return { to_v4(ip.to_v6()) };`
`162`	`173`	`}`
`163`	`174`	`catch (const std::exception&)`
`164`	`175`	`{`
	`176`	`+ return ip;`
`165`	`177`	`}`
`166`	`178`	`}`
`167`	`179`
`@@ -176,7 +188,7 @@ inline std::string to_host(const boost::asio::ip::address_v6& ip6) NOEXCEPT`
`176`	`188`	`try`
`177`	`189`	`{`
`178`	`190`	`BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)`
`179`		`- return is_embedded_v4(ip6) ? to_host(ip6.to_v4()) : ip6.to_string();`
	`191`	`+ return ip6.is_v4_mapped() ? to_host(to_v4(ip6)) : ip6.to_string();`
`180`	`192`	`BC_POP_WARNING()`
`181`	`193`	`}`
`182`	`194`	`catch (const std::exception&)`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,7 @@ void set_console_echo() NOEXCEPT`
`86`	`86`	`DWORD mode{};`
`87`	`87`	`GetConsoleMode(handle, &mode);`
`88`	`88`	`SetConsoleMode(handle, mode \| ENABLE_ECHO_INPUT);`
	`89`	`+ FlushConsoleInputBuffer(handle);`
`89`	`90`	`}`
`90`	`91`
`91`	`92`	`void unset_console_echo() NOEXCEPT`
`@@ -94,6 +95,7 @@ void unset_console_echo() NOEXCEPT`
`94`	`95`	`DWORD mode{};`
`95`	`96`	`GetConsoleMode(handle, &mode);`
`96`	`97`	`SetConsoleMode(handle, mode & ~ENABLE_ECHO_INPUT);`
	`98`	`+ FlushConsoleInputBuffer(handle);`
`97`	`99`	`}`
`98`	`100`
`99`	`101`	`#else // HAVE_MSC`