Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed
wants to merge 5 commits into from
Closed

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

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8cba69f
8285515: use disconnectx to disconnect a datagram socket on __APPLE__…
jaikiran Apr 25, 2022
c25d120
Use macOS instead of MacOSX in comment
jaikiran Apr 28, 2022
fd05ea6
add @bug 8285515 to testcases that failed without this change
jaikiran Apr 28, 2022
2763921
Revert "add @bug 8285515 to testcases that failed without this change"
jaikiran Apr 28, 2022
16de552
Alan's suggestion - add @bug to just one test
jaikiran Apr 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,28 @@ Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jclass clazz,
jint fd = fdval(env, fdo);
int rv;

#if defined(__APPLE__)
// On macOS systems we use disconnectx
rv = disconnectx(fd, SAE_ASSOCID_ANY, SAE_CONNID_ANY);
#else
SOCKETADDRESS sa;
memset(&sa, 0, sizeof(sa));
#if defined(_ALLBSD_SOURCE)
sa.sa.sa_family = isIPv6 ? AF_INET6 : AF_INET;
#else
sa.sa.sa_family = AF_UNSPEC;
#endif
socklen_t len = isIPv6 ? sizeof(struct sockaddr_in6) :
sizeof(struct sockaddr_in);

memset(&sa, 0, sizeof(sa));
#if defined(_ALLBSD_SOURCE)
sa.sa.sa_family = isIPv6 ? AF_INET6 : AF_INET;
#else
sa.sa.sa_family = AF_UNSPEC;
#endif

rv = connect(fd, &sa.sa, len);
#endif

#if defined(_ALLBSD_SOURCE)
#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;
#elif defined(_AIX)
Expand Down