8062744: jdk.net.Sockets.setOption/getOption does not support IP_TOS
Reviewed-by: alanb, chegar
This commit is contained in:
parent
5598ed0cf0
commit
df1eec112e
jdk
src/java.base/share/classes
test/jdk/net/Sockets
@ -446,6 +446,7 @@ public abstract class SocketImpl implements SocketOptions {
|
||||
|
||||
serverSocketOptions.add(StandardSocketOptions.SO_RCVBUF);
|
||||
serverSocketOptions.add(StandardSocketOptions.SO_REUSEADDR);
|
||||
serverSocketOptions.add(StandardSocketOptions.IP_TOS);
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -276,6 +276,7 @@ public class Sockets {
|
||||
set = new HashSet<>();
|
||||
set.add(StandardSocketOptions.SO_RCVBUF);
|
||||
set.add(StandardSocketOptions.SO_REUSEADDR);
|
||||
set.add(StandardSocketOptions.IP_TOS);
|
||||
set = Collections.unmodifiableSet(set);
|
||||
options.put(ServerSocket.class, set);
|
||||
|
||||
|
48
jdk/test/jdk/net/Sockets/SupportedOptions.java
Normal file
48
jdk/test/jdk/net/Sockets/SupportedOptions.java
Normal file
@ -0,0 +1,48 @@
|
||||
/*
|
||||
* Copyright (c) 2014, 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
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 8062744
|
||||
* @run main SupportedOptions
|
||||
*/
|
||||
|
||||
import java.net.*;
|
||||
import java.io.IOException;
|
||||
import jdk.net.*;
|
||||
|
||||
public class SupportedOptions {
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
if (!Sockets.supportedOptions(ServerSocket.class)
|
||||
.contains(StandardSocketOptions.IP_TOS)) {
|
||||
throw new RuntimeException("Test failed");
|
||||
}
|
||||
// Now set the option
|
||||
ServerSocket ss = new ServerSocket();
|
||||
if (!ss.supportedOptions().contains(StandardSocketOptions.IP_TOS)) {
|
||||
throw new RuntimeException("Test failed");
|
||||
}
|
||||
Sockets.setOption(ss, java.net.StandardSocketOptions.IP_TOS, 128);
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user