--- a/jdk/src/share/classes/java/net/SocketInputStream.java Thu Mar 11 17:37:33 2010 +0000
+++ b/jdk/src/share/classes/java/net/SocketInputStream.java Thu Mar 11 17:50:30 2010 +0000
@@ -118,6 +118,10 @@
* @exception IOException If an I/O error has occurred.
*/
public int read(byte b[], int off, int length) throws IOException {
+ return read(b, off, length, impl.getTimeout());
+ }
+
+ int read(byte b[], int off, int length, int timeout) throws IOException {
int n;
// EOF already encountered
@@ -143,7 +147,7 @@
// acquire file descriptor and do the read
FileDescriptor fd = impl.acquireFD();
try {
- n = socketRead0(fd, b, off, length, impl.getTimeout());
+ n = socketRead0(fd, b, off, length, timeout);
if (n > 0) {
return n;
}
@@ -161,7 +165,7 @@
impl.setConnectionResetPending();
impl.acquireFD();
try {
- n = socketRead0(fd, b, off, length, impl.getTimeout());
+ n = socketRead0(fd, b, off, length, timeout);
if (n > 0) {
return n;
}
--- a/jdk/src/share/classes/java/net/SocksSocketImpl.java Thu Mar 11 17:37:33 2010 +0000
+++ b/jdk/src/share/classes/java/net/SocksSocketImpl.java Thu Mar 11 17:50:30 2010 +0000
@@ -98,11 +98,31 @@
super.connect(new InetSocketAddress(host, port), timeout);
}
+ private static int remainingMillis(long deadlineMillis) throws IOException {
+ if (deadlineMillis == 0L)
+ return 0;
+
+ final long remaining = deadlineMillis - System.currentTimeMillis();
+ if (remaining > 0)
+ return (int) remaining;
+
+ throw new SocketTimeoutException();
+ }
+
private int readSocksReply(InputStream in, byte[] data) throws IOException {
+ return readSocksReply(in, data, 0L);
+ }
+
+ private int readSocksReply(InputStream in, byte[] data, long deadlineMillis) throws IOException {
int len = data.length;
int received = 0;
for (int attempts = 0; received < len && attempts < 3; attempts++) {
- int count = in.read(data, received, len - received);
+ int count;
+ try {
+ count = ((SocketInputStream)in).read(data, received, len - received, remainingMillis(deadlineMillis));
+ } catch (SocketTimeoutException e) {
+ throw new SocketTimeoutException("Connect timed out");
+ }
if (count < 0)
throw new SocketException("Malformed reply from SOCKS server");
received += count;
@@ -115,6 +135,12 @@
*/
private boolean authenticate(byte method, InputStream in,
BufferedOutputStream out) throws IOException {
+ return authenticate(method, in, out, 0L);
+ }
+
+ private boolean authenticate(byte method, InputStream in,
+ BufferedOutputStream out,
+ long deadlineMillis) throws IOException {
// No Authentication required. We're done then!
if (method == NO_AUTH)
return true;
@@ -162,7 +188,7 @@
out.write(0);
out.flush();
byte[] data = new byte[2];
- int i = readSocksReply(in, data);
+ int i = readSocksReply(in, data, deadlineMillis);
if (i != 2 || data[1] != 0) {
/* RFC 1929 specifies that the connection MUST be closed if
authentication fails */
@@ -201,18 +227,18 @@
// out.write(outToken);
// out.flush();
// data = new byte[2];
-// i = readSocksReply(in, data);
+// i = readSocksReply(in, data, deadlineMillis);
// if (i != 2 || data[1] == 0xff) {
// in.close();
// out.close();
// return false;
// }
-// i = readSocksReply(in, data);
+// i = readSocksReply(in, data, deadlineMillis);
// int len = 0;
// len = ((int)data[0] & 0xff) << 8;
// len += data[1];
// data = new byte[len];
-// i = readSocksReply(in, data);
+// i = readSocksReply(in, data, deadlineMillis);
// if (i == len)
// return true;
// in.close();
@@ -231,7 +257,8 @@
}
private void connectV4(InputStream in, OutputStream out,
- InetSocketAddress endpoint) throws IOException {
+ InetSocketAddress endpoint,
+ long deadlineMillis) throws IOException {
if (!(endpoint.getAddress() instanceof Inet4Address)) {
throw new SocketException("SOCKS V4 requires IPv4 only addresses");
}
@@ -249,7 +276,7 @@
out.write(0);
out.flush();
byte[] data = new byte[8];
- int n = readSocksReply(in, data);
+ int n = readSocksReply(in, data, deadlineMillis);
if (n != 8)
throw new SocketException("Reply from SOCKS server has bad length: " + n);
if (data[0] != 0 && data[0] != 4)
@@ -296,6 +323,15 @@
*/
@Override
protected void connect(SocketAddress endpoint, int timeout) throws IOException {
+ final long deadlineMillis;
+
+ if (timeout == 0) {
+ deadlineMillis = 0L;
+ } else {
+ long finish = System.currentTimeMillis() + timeout;
+ deadlineMillis = finish < 0 ? Long.MAX_VALUE : finish;
+ }
+
SecurityManager security = System.getSecurityManager();
if (endpoint == null || !(endpoint instanceof InetSocketAddress))
throw new IllegalArgumentException("Unsupported address type");
@@ -322,7 +358,7 @@
/*
* No default proxySelector --> direct connection
*/
- super.connect(epoint, timeout);
+ super.connect(epoint, remainingMillis(deadlineMillis));
return;
}
URI uri;
@@ -345,13 +381,13 @@
java.util.Iterator<Proxy> iProxy = null;
iProxy = sel.select(uri).iterator();
if (iProxy == null || !(iProxy.hasNext())) {
- super.connect(epoint, timeout);
+ super.connect(epoint, remainingMillis(deadlineMillis));
return;
}
while (iProxy.hasNext()) {
p = iProxy.next();
if (p == null || p == Proxy.NO_PROXY) {
- super.connect(epoint, timeout);
+ super.connect(epoint, remainingMillis(deadlineMillis));
return;
}
if (p.type() != Proxy.Type.SOCKS)
@@ -364,7 +400,7 @@
// Connects to the SOCKS server
try {
- privilegedConnect(server, serverPort, timeout);
+ privilegedConnect(server, serverPort, remainingMillis(deadlineMillis));
// Worked, let's get outta here
break;
} catch (IOException e) {
@@ -388,7 +424,7 @@
} else {
// Connects to the SOCKS server
try {
- privilegedConnect(server, serverPort, timeout);
+ privilegedConnect(server, serverPort, remainingMillis(deadlineMillis));
} catch (IOException e) {
throw new SocketException(e.getMessage());
}
@@ -403,7 +439,7 @@
// DOMAIN type of addresses (unresolved addresses here)
if (epoint.isUnresolved())
throw new UnknownHostException(epoint.toString());
- connectV4(in, out, epoint);
+ connectV4(in, out, epoint, deadlineMillis);
return;
}
@@ -414,7 +450,7 @@
out.write(USER_PASSW);
out.flush();
byte[] data = new byte[2];
- int i = readSocksReply(in, data);
+ int i = readSocksReply(in, data, deadlineMillis);
if (i != 2 || ((int)data[0]) != PROTO_VERS) {
// Maybe it's not a V5 sever after all
// Let's try V4 before we give up
@@ -422,12 +458,12 @@
// DOMAIN type of addresses (unresolved addresses here)
if (epoint.isUnresolved())
throw new UnknownHostException(epoint.toString());
- connectV4(in, out, epoint);
+ connectV4(in, out, epoint, deadlineMillis);
return;
}
if (((int)data[1]) == NO_METHODS)
throw new SocketException("SOCKS : No acceptable methods");
- if (!authenticate(data[1], in, out)) {
+ if (!authenticate(data[1], in, out, deadlineMillis)) {
throw new SocketException("SOCKS : authentication failed");
}
out.write(PROTO_VERS);
@@ -457,7 +493,7 @@
}
out.flush();
data = new byte[4];
- i = readSocksReply(in, data);
+ i = readSocksReply(in, data, deadlineMillis);
if (i != 4)
throw new SocketException("Reply from SOCKS server has bad length");
SocketException ex = null;
@@ -469,33 +505,33 @@
switch(data[3]) {
case IPV4:
addr = new byte[4];
- i = readSocksReply(in, addr);
+ i = readSocksReply(in, addr, deadlineMillis);
if (i != 4)
throw new SocketException("Reply from SOCKS server badly formatted");
data = new byte[2];
- i = readSocksReply(in, data);
+ i = readSocksReply(in, data, deadlineMillis);
if (i != 2)
throw new SocketException("Reply from SOCKS server badly formatted");
break;
case DOMAIN_NAME:
len = data[1];
byte[] host = new byte[len];
- i = readSocksReply(in, host);
+ i = readSocksReply(in, host, deadlineMillis);
if (i != len)
throw new SocketException("Reply from SOCKS server badly formatted");
data = new byte[2];
- i = readSocksReply(in, data);
+ i = readSocksReply(in, data, deadlineMillis);
if (i != 2)
throw new SocketException("Reply from SOCKS server badly formatted");
break;
case IPV6:
len = data[1];
addr = new byte[len];
- i = readSocksReply(in, addr);
+ i = readSocksReply(in, addr, deadlineMillis);
if (i != len)
throw new SocketException("Reply from SOCKS server badly formatted");
data = new byte[2];
- i = readSocksReply(in, data);
+ i = readSocksReply(in, data, deadlineMillis);
if (i != 2)
throw new SocketException("Reply from SOCKS server badly formatted");
break;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/net/Socket/SocksConnectTimeout.java Thu Mar 11 17:50:30 2010 +0000
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2010 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug 6223635
+ * @summary Code hangs at connect call even when Timeout is specified
+ */
+
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Proxy;
+import java.net.Socket;
+import java.net.ServerSocket;
+import java.net.SocketTimeoutException;
+import java.io.IOException;
+import java.io.Closeable;
+import java.util.concurrent.Phaser;
+import java.util.concurrent.TimeUnit;
+
+public class SocksConnectTimeout {
+ static ServerSocket serverSocket;
+ static final boolean debug = true;
+ static final Phaser startPhaser = new Phaser(2);
+ static final Phaser finishPhaser = new Phaser(2);
+ static int failed, passed;
+
+ public static void main(String[] args) {
+ try {
+ serverSocket = new ServerSocket(0);
+
+ (new Thread() {
+ @Override
+ public void run() { serve(); }
+ }).start();
+
+ Proxy socksProxy = new Proxy(Proxy.Type.SOCKS,
+ new InetSocketAddress(InetAddress.getLocalHost(), serverSocket.getLocalPort()));
+
+ test(socksProxy);
+ } catch (IOException e) {
+ unexpected(e);
+ } finally {
+ close(serverSocket);
+
+ if (failed > 0)
+ throw new RuntimeException("Test Failed: passed:" + passed + ", failed:" + failed);
+ }
+ }
+
+ static void test(Proxy proxy) {
+ startPhaser.arriveAndAwaitAdvance();
+ Socket socket = null;
+ try {
+ socket = new Socket(proxy);
+ connectWithTimeout(socket);
+ failed("connected successfully!");
+ } catch (SocketTimeoutException socketTimeout) {
+ debug("Passed: Received: " + socketTimeout);
+ passed();
+ } catch (Exception exception) {
+ failed("Connect timeout test failed", exception);
+ } finally {
+ finishPhaser.arriveAndAwaitAdvance();
+ close(socket);
+ }
+ }
+
+ static void connectWithTimeout(Socket socket) throws IOException {
+ socket.connect(new InetSocketAddress(InetAddress.getLocalHost(), 1234), 500);
+ }
+
+ static void serve() {
+ Socket client = null;
+ try {
+ startPhaser.arriveAndAwaitAdvance();
+ client = serverSocket.accept();
+ finishPhaser.awaitAdvanceInterruptibly(finishPhaser.arrive(), 5, TimeUnit.SECONDS);
+ } catch (Exception e) {
+ unexpected(e);
+ } finally {
+ close(client);
+ }
+ }
+
+ static void debug(String message) {
+ if (debug)
+ System.out.println(message);
+ }
+
+ static void unexpected(Exception e ) {
+ System.out.println("Unexcepted Exception: " + e);
+ }
+
+ static void close(Closeable closeable) {
+ if (closeable != null) try { closeable.close(); } catch (IOException e) {unexpected(e);}
+ }
+
+ static void failed(String message) {
+ System.out.println(message);
+ failed++;
+ }
+
+ static void failed(String message, Exception e) {
+ System.out.println(message);
+ System.out.println(e);
+ failed++;
+ }
+
+ static void passed() { passed++; };
+
+}