8285515: (dc) DatagramChannel.disconnect fails with "Invalid argument" on macOS 12.4

Reviewed-by: phh, shade
Backport-of: 269eae61894b6bd0a7512045a369b53df747f6e5

Author: Ben Taylor

jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c

@@ -89,9 +89,10 @@ Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jobject this,
 
 #ifdef __solaris__
     rv = connect(fd, 0, 0);
-#endif
-
-#if defined(__linux__) || defined(_ALLBSD_SOURCE) || defined(_AIX)
+#elif defined(__APPLE__)
+    // On macOS systems we use disconnectx
+    rv = disconnectx(fd, SAE_ASSOCID_ANY, SAE_CONNID_ANY);
+#elif defined(__linux__) || defined(_ALLBSD_SOURCE) || defined(_AIX)
     {
         int len;
         SOCKADDR sa;
@@ -120,8 +121,16 @@ Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jobject this,
         }
 
         rv = connect(fd, (struct sockaddr *)&sa, len);
+    }
 
-#if defined(_ALLBSD_SOURCE)
+#endif
+
+#if defined(_ALLBSD_SOURCE) && !defined(__APPLE__)
+        // On _ALLBSD_SOURCE except __APPLE__ we consider EADDRNOTAVAIL
+        // error to be OK and ignore it. __APPLE__ systems are excluded
+        // in this check since for __APPLE__ systems, unlike other BSD systems,
+        // we issue a "disconnectx" call (a few lines above),
+        // which isn't expected to return this error code.
         if (rv < 0 && errno == EADDRNOTAVAIL)
                 rv = errno = 0;
 #endif
@@ -133,8 +142,6 @@ Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jobject this,
         if (rv < 0 && errno == EAFNOSUPPORT)
             rv = errno = 0;
 #endif
-    }
-#endif
 
     if (rv < 0)
         handleSocketError(env, errno);

jdk/test/java/nio/channels/DatagramChannel/Disconnect.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2022, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,7 +22,8 @@
  */
 
 /* @test
- * @bug 7132924
+ * @bug 7132924 8285515
+ * @key intermittent
  * @summary Test DatagramChannel.disconnect when DatagramChannel is connected to an IPv4 socket
  * @run main Disconnect
  * @run main/othervm -Djava.net.preferIPv4Stack=true Disconnect