From d09276fe016c10dc765bb74766df13be9f13d751 Mon Sep 17 00:00:00 2001 From: Meteorite Date: Thu, 20 Feb 2020 11:04:39 +0300 Subject: [PATCH] extract makeInetSocketAddress (by hostname) in SocketClient (#509) to allow overriding with InetSocketAddress.createUnresolved for use with proxy Co-authored-by: Jeroen van Erp --- src/main/java/net/schmizz/sshj/SocketClient.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/schmizz/sshj/SocketClient.java b/src/main/java/net/schmizz/sshj/SocketClient.java index 09af3b45..8d916f73 100644 --- a/src/main/java/net/schmizz/sshj/SocketClient.java +++ b/src/main/java/net/schmizz/sshj/SocketClient.java @@ -53,6 +53,10 @@ public abstract class SocketClient { this.defaultPort = defaultPort; } + protected InetSocketAddress makeInetSocketAddress(String hostname, int port) { + return new InetSocketAddress(hostname, port); + } + /** * Connect to a host via a proxy. * @param hostname The host name to connect to. @@ -83,7 +87,7 @@ public abstract class SocketClient { } else { socket = new Socket(proxy); } - socket.connect(new InetSocketAddress(hostname, port), connectTimeout); + socket.connect(makeInetSocketAddress(hostname, port), connectTimeout); onConnect(); } @@ -131,7 +135,7 @@ public abstract class SocketClient { this.hostname = hostname; this.port = port; socket = socketFactory.createSocket(); - socket.connect(new InetSocketAddress(hostname, port), connectTimeout); + socket.connect(makeInetSocketAddress(hostname, port), connectTimeout); onConnect(); } } @@ -144,7 +148,7 @@ public abstract class SocketClient { this.port = port; socket = socketFactory.createSocket(); socket.bind(new InetSocketAddress(localAddr, localPort)); - socket.connect(new InetSocketAddress(hostname, port), connectTimeout); + socket.connect(makeInetSocketAddress(hostname, port), connectTimeout); onConnect(); } }