archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

8303509: Socket setTrafficClass does not work for IPv4 connections when IPv6 enabled

Browse source 
Reviewed-by: djelinski, michaelm
This commit is contained in:
Alan Bateman 2023-03-09 08:13:57 +00:00
parent dc523a58a6
commit dd79410824
5 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/java.base/share/classes/sun/nio/ch/Net.java
View file

@ -55,7 +55,6 @@ import sun.net.util.IPAddressUtil;
import sun.security.action.GetPropertyAction;
public class Net {
private Net() { }
// unspecified protocol family
@ -100,8 +99,8 @@ public class Net {
/**
* Tells whether both IPV6_XXX and IP_XXX socket options should be set on
* IPv6 sockets. On some kernels, both IPV6_XXX and IP_XXX socket options
* need to be set so that the settings are effective for IPv4 multicast
* datagrams sent using the socket.
* need to be set so that the settings are effective for IPv4 connections
* and datagrams.
*/
static boolean shouldSetBothIPv4AndIPv6Options() {
return shouldSetBothIPv4AndIPv6Options0();
@ -448,6 +447,23 @@ public class Net {
setIntOption0(fd, mayNeedConversion, key.level(), key.name(), arg, isIPv6);
}
/**
* Sets a IPPROTO_IPV6/IPPROTO level socket. Some platforms require both
* IPPROTO_IPV6 and IPPROTO socket options to be set when the socket is IPv6.
* In that case, the IPPROTO socket option is set on a best effort basis.
*/
static <T> void setIpSocketOption(FileDescriptor fd, ProtocolFamily family,
SocketOption<T> opt, T value)
throws IOException
{
setSocketOption(fd, family, opt, value);
if (family == StandardProtocolFamily.INET6 && shouldSetBothIPv4AndIPv6Options()) {
try {
setSocketOption(fd, StandardProtocolFamily.INET, opt, value);
} catch (IOException ignore) { }
}
}
static Object getSocketOption(FileDescriptor fd, SocketOption<?> name)
throws IOException
{
@ -483,7 +499,7 @@ public class Net {
}
}
public static boolean isFastTcpLoopbackRequested() {
private static boolean isFastTcpLoopbackRequested() {
String loopbackProp = GetPropertyAction
.privilegedGetProperty("jdk.net.useFastTcpLoopback", "false");
return loopbackProp.isEmpty() || Boolean.parseBoolean(loopbackProp);

8
src/java.base/share/classes/sun/nio/ch/NioSocketImpl.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2023, 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
@ -957,8 +957,8 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
synchronized (stateLock) {
ensureOpen();
if (opt == StandardSocketOptions.IP_TOS) {
// maps to IP_TOS or IPV6_TCLASS
Net.setSocketOption(fd, family(), opt, value);
// maps to IPV6_TCLASS and/or IP_TOS
Net.setIpSocketOption(fd, family(), opt, value);
} else if (opt == StandardSocketOptions.SO_REUSEADDR) {
boolean b = (boolean) value;
if (Net.useExclusiveBind()) {
@ -1032,7 +1032,7 @@ public final class NioSocketImpl extends SocketImpl implements PlatformSocketImp
}
case IP_TOS: {
int i = intValue(value, "IP_TOS");
Net.setSocketOption(fd, family(), StandardSocketOptions.IP_TOS, i);
Net.setIpSocketOption(fd, family(), StandardSocketOptions.IP_TOS, i);
break;
}
case TCP_NODELAY: {

4
src/java.base/share/classes/sun/nio/ch/SocketChannelImpl.java
View file

@ -272,8 +272,8 @@ class SocketChannelImpl
if (isNetSocket()) {
if (name == StandardSocketOptions.IP_TOS) {
// special handling for IP_TOS
Net.setSocketOption(fd, family, name, value);
// maps to IPV6_TCLASS and/or IP_TOS
Net.setIpSocketOption(fd, family, name, value);
return this;
}
if (name == StandardSocketOptions.SO_REUSEADDR && Net.useExclusiveBind()) {