Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jdk-macos-legacy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
einsteinathome
openjdk
jdk-macos-legacy
Commits
6b1145bc
Commit
6b1145bc
authored
1 year ago
by
Jazzzny
Browse files
Options
Downloads
Patches
Plain Diff
Fix disconnectx
parent
3da2f268
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
patches/17/remove_disconnectx.patch
+4
-4
4 additions, 4 deletions
patches/17/remove_disconnectx.patch
with
4 additions
and
4 deletions
patches/17/remove_disconnectx.patch
+
4
−
4
View file @
6b1145bc
diff --git a/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c b/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c
diff --git a/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c b/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c
index 902a816419d..
553126950f
a 100644
index 902a816419d..
6397d79447
a 100644
--- a/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c
--- a/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c
+++ b/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c
+++ b/src/java.base/unix/native/libnio/ch/DatagramChannelImpl.c
@@ -50,28 +50,2
1
@@
Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jclass clazz,
@@ -50,28 +50,2
0
@@
Java_sun_nio_ch_DatagramChannelImpl_disconnect0(JNIEnv *env, jclass clazz,
jint fd = fdval(env, fdo);
jint fd = fdval(env, fdo);
int rv;
int rv;
...
@@ -20,15 +20,15 @@ index 902a816419d..553126950fa 100644
...
@@ -20,15 +20,15 @@ index 902a816419d..553126950fa 100644
- #endif
- #endif
socklen_t len = isIPv6 ? sizeof(struct sockaddr_in6) :
socklen_t len = isIPv6 ? sizeof(struct sockaddr_in6) :
sizeof(struct sockaddr_in);
sizeof(struct sockaddr_in);
- rv = connect(fd, &sa.sa, len);
+
+
+ memset(&sa, 0, sizeof(sa));
+ memset(&sa, 0, sizeof(sa));
+#if defined(_ALLBSD_SOURCE)
+#if defined(_ALLBSD_SOURCE)
+ sa.sa.sa_family = isIPv6 ? AF_INET6 : AF_INET;
+ sa.sa.sa_family = isIPv6 ? AF_INET6 : AF_INET;
+#else
+#else
+ sa.sa.sa_family = AF_UNSPEC;
+ sa.sa.sa_family = AF_UNSPEC;
+#endif
rv = connect(fd, &sa.sa, len);
#endif
#endif
+ rv = connect(fd, &sa.sa, len);
-#if defined(_ALLBSD_SOURCE) && !defined(__APPLE__)
-#if defined(_ALLBSD_SOURCE) && !defined(__APPLE__)
- // On _ALLBSD_SOURCE except __APPLE__ we consider EADDRNOTAVAIL
- // On _ALLBSD_SOURCE except __APPLE__ we consider EADDRNOTAVAIL
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment