When connecting to a SOCKS proxy, use the resolved IP

Noticed while inspecting the code. In HttpURLConnection a similar
change was made recently (commit
797fdc6cc6bf16372e9464f189b535148f944ce9).

Previously if the Proxy was specified with a resolved
InetSocketAddress (i.e. one with a specific IP address already
determined) the hostname would still be used to work out an IP
address to connect to. For host names with multiple IPs the host
connected to could be a different one than the one specified.

Now if the InetAddress has been resolved it will be used. In the
case where the InetAddress is bad this may delay DNS / resolution
errors to later in the connection process. It will, however, avoid
the "connect to a different host" issue, and avoid a reverse DNS
lookup here when the host is not yet known.

Change-Id: I46df5c38942f2d356ba2fd4541e0269021fd6496

1 files changed, 3 insertions, 7 deletions

diff --git a/luni/src/main/java/java/net/PlainSocketImpl.java b/luni/src/main/java/java/net/PlainSocketImpl.java
index 4e5ba44..0c50f62 100644
--- a/luni/src/main/java/java/net/PlainSocketImpl.java
+++ b/luni/src/main/java/java/net/PlainSocketImpl.java
@@ -301,16 +301,12 @@ public class PlainSocketImpl extends SocketImpl {
      * Gets the InetAddress of the SOCKS proxy server.
      */
     private InetAddress socksGetServerAddress() throws UnknownHostException {
-        String proxyName;
         // get socks server address from proxy. It is unnecessary to check
         // "socksProxyHost" property, since all proxy setting should be
         // determined by ProxySelector.
-        InetSocketAddress addr = (InetSocketAddress) proxy.address();
-        proxyName = addr.getHostName();
-        if (proxyName == null) {
-            proxyName = addr.getAddress().getHostAddress();
-        }
-        return InetAddress.getByName(proxyName);
+        InetSocketAddress socketAddress = (InetSocketAddress) proxy.address();
+        InetAddress address = socketAddress.getAddress();
+        return (address != null) ? address : InetAddress.getByName(socketAddress.getHostName());
     }
 
     /**