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.

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

8245194: Unix domain socket channel implementation #52

Closed
Closed
Changes from 2 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
e2eb987
unixdomainchannels: initial commit from hg sandbox with changes from …
Michael-Mc-Mahon Sep 7, 2020
6d164c9
unixdomainchannels: fixing compile error on Windows and Alan's review…
Michael-Mc-Mahon Sep 7, 2020
4d08c15
Made some changes relating to selection of the local directory where …
Michael-Mc-Mahon Sep 11, 2020
110b45c
Merge branch 'master' into unixdomainchannels
Michael-Mc-Mahon Sep 14, 2020
22f37a8
unixdomainchannels: updates from review of Sept 11 2020
Michael-Mc-Mahon Sep 14, 2020
3669509
unixdomainchannels: updates after comments sent by Alan 14 Sept
Michael-Mc-Mahon Sep 21, 2020
d29e8cc
unixdomainchannels: some tests were failing on Windows version prior …
Michael-Mc-Mahon Sep 24, 2020
a08186d
Merge branch 'master' into unixdomainchannels
Michael-Mc-Mahon Sep 24, 2020
c669e2d
unixdomainchannels: Update after Alan's review of Sept 29
Michael-Mc-Mahon Sep 29, 2020
4dc90c7
unixdomainchannels: typo in WindowsFileSystemProvider.java
Michael-Mc-Mahon Sep 29, 2020
3fe6baa
unixdomainchannels: change to Net.c was missed after all
Michael-Mc-Mahon Sep 29, 2020
e78228b
unixdomainchannels: remove more cruft from Windows Net.c
Michael-Mc-Mahon Sep 30, 2020
c40d205
Merge branch 'master' into unixdomainchannels
Michael-Mc-Mahon Sep 30, 2020
275e092
unixdomainchannels:
Michael-Mc-Mahon Oct 2, 2020
dc70cd6
unixdomainchannels: error in the last commit in make/modules/java.bas…
Michael-Mc-Mahon Oct 2, 2020
0096645
- simplified Copy.gmk to CAT source files directly
Michael-Mc-Mahon Oct 4, 2020
17acf10
- update after Alan's review on Oct 4
Michael-Mc-Mahon Oct 6, 2020
36efb46
Merge branch 'master' into unixdomainchannels
Michael-Mc-Mahon Oct 6, 2020
0e8e527
unixdomainchannels:
Michael-Mc-Mahon Oct 6, 2020
cb28f3c
unixdomainchannels: updates from Chris's review 9 Oct 2020
Michael-Mc-Mahon Oct 9, 2020
36a0e30
- reorganised the channel impls back into SocketChannelImpl and Serve…
Michael-Mc-Mahon Oct 13, 2020
7f677d5
Merge branch 'master' into unixdomainchannels
Michael-Mc-Mahon Oct 13, 2020
4bbbde3
src changes from Daniel's review. Tests will come later
Michael-Mc-Mahon Oct 14, 2020
3859e61
- test updates from Daniel's review 14 Oct 2020
Michael-Mc-Mahon Oct 14, 2020
8a545a7
fix white space error
Michael-Mc-Mahon Oct 14, 2020
15dc94b
- use String.isEmpty where appropriate
Michael-Mc-Mahon Oct 15, 2020
2d59542
- added NullTest and fix in SocketChannel.open
Michael-Mc-Mahon Oct 16, 2020
d0ae134
- Alan's review patch from Oct 18
Michael-Mc-Mahon Oct 19, 2020
eca95d8
Merge branch 'master' into unixdomainchannels
Michael-Mc-Mahon Oct 19, 2020
36623a4
final feedback from Alan
Michael-Mc-Mahon Oct 19, 2020
053bffe
Merge branch 'master' into unixdomainchannels
Michael-Mc-Mahon Oct 20, 2020
cc106a7
update from Daniel's test comments
Michael-Mc-Mahon Oct 20, 2020
3594e4b
forgot to stage updated test files in last commit
Michael-Mc-Mahon Oct 20, 2020
e07522b
further test update from Daniel
Michael-Mc-Mahon Oct 20, 2020
368fa8b
updated one error in review
Michael-Mc-Mahon Oct 21, 2020
01d7cf5
Merge branch 'master' into unixdomainchannels
Michael-Mc-Mahon Oct 21, 2020
c01c3c9
- fixed 32 bit Linux build error
Michael-Mc-Mahon Oct 22, 2020
bb6c729
tidy up WindowsSelectorImpl
Michael-Mc-Mahon Oct 27, 2020
1a8b304
Merge branch 'master' into unixdomainchannels
Michael-Mc-Mahon Oct 27, 2020
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
5 changes: 2 additions & 3 deletions src/java.base/windows/native/libnio/ch/Net.c
Original file line number Diff line number Diff line change
@@ -34,7 +34,6 @@
#include "nio_util.h"
#include "net_util.h"

#include "java_net_InetAddress.h"
#include "sun_nio_ch_Net.h"
#include "sun_nio_ch_PollArrayWrapper.h"

@@ -327,7 +326,7 @@ Java_sun_nio_ch_Net_localInetAddress(JNIEnv *env, jclass clazz, jobject fdo)
NET_ThrowNew(env, WSAGetLastError(), "getsockname");
return NULL;
}
return NET_SockaddrToInetAddress(env, (SOCKETADDRESS *)&sa, &port);
return NET_SockaddrToInetAddress(env, &sa, &port);
}

JNIEXPORT jint JNICALL
@@ -358,7 +357,7 @@ Java_sun_nio_ch_Net_remoteInetAddress(JNIEnv *env, jclass clazz, jobject fdo)
NET_ThrowNew(env, WSAGetLastError(), "getsockname");
return NULL;
}
return NET_SockaddrToInetAddress(env, (SOCKETADDRESS *)&sa, &port);
return NET_SockaddrToInetAddress(env, &sa, &port);
}

JNIEXPORT jint JNICALL