4150. [bug] win32: listen-on-v6 { any; }; was not working. Apply

                        minimal fix.  [RT #39667]

diff --git a/CHANGES b/CHANGES
index d94615460ec7809f6fdf66995b2c6d90c2ae64b4..c08745e8e5a2d57aae5896815b67da001dfba65b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+4150.  [bug]           win32: listen-on-v6 { any; }; was not working.  Apply
+                       minimal fix.  [RT #39667]
+
 4149.  [bug]           Fixed a race condition in the getaddrinfo()
                        implementation in libirs, which caused the delv
                        utility to crash with an assertion failure when using

diff --git a/lib/isc/win32/net.c b/lib/isc/win32/net.c
index 51d6fc8fc5b52ea7e328a168a44985123e088c97..f09ca957e4ba74eebf5da111cf850b935c4c8326 100644 (file)
--- a/lib/isc/win32/net.c
+++ b/lib/isc/win32/net.c
@@ -209,6 +209,12 @@ initialize_ipv6only(void) {
                                  try_ipv6only) == ISC_R_SUCCESS);
 }
 
+#ifdef __notyet__
+/*
+ * XXXMPA requires win32/socket.c to be updated to support
+ * WSASendMsg and WSARecvMsg which are themselves Winsock
+ * and compiler version dependent.
+ */
 static void
 try_ipv6pktinfo(void) {
        SOCKET s;
@@ -262,6 +268,7 @@ initialize_ipv6pktinfo(void) {
        RUNTIME_CHECK(isc_once_do(&once_ipv6pktinfo,
                                  try_ipv6pktinfo) == ISC_R_SUCCESS);
 }
+#endif /* __notyet__ */
 #endif /* WANT_IPV6 */
 #endif /* ISC_PLATFORM_HAVEIPV6 */
 
@@ -279,6 +286,7 @@ isc_net_probe_ipv6only(void) {
 
 isc_result_t
 isc_net_probe_ipv6pktinfo(void) {
+#ifdef __notyet__
 #ifdef ISC_PLATFORM_HAVEIPV6
 #ifdef WANT_IPV6
        initialize_ipv6pktinfo();
@@ -286,6 +294,7 @@ isc_net_probe_ipv6pktinfo(void) {
        ipv6pktinfo_result = ISC_R_NOTFOUND;
 #endif
 #endif
+#endif /* __notyet__ */
        return (ipv6pktinfo_result);
 }