Mirrors/sshj
1
0
Fork 0
mirror of https://github.com/hierynomus/sshj.git synced 2025-12-08 08:10:55 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Added support for (unauthenticated) HTTP proxies (fixes #170)"

Browse Source 
This reverts commit fc535a5e76.
This commit is contained in:
Jeroen van Erp
2015-03-30 21:48:07 +02:00
parent 3c1e0c1629
commit 8398b6e3c3
2 changed files with 14 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/net/schmizz/sshj/SocketClient.java
View File

@@ -15,8 +15,7 @@
*/
package net.schmizz.sshj;
import com.hierynomus.sshj.socket.SocketFactory;
import javax.net.SocketFactory;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -33,7 +32,10 @@ public abstract class SocketClient {
private InputStream input;
private OutputStream output;
private SocketFactory socketFactory = new SocketFactory();
private SocketFactory socketFactory = SocketFactory.getDefault();
private static final int DEFAULT_CONNECT_TIMEOUT = 0;
private int connectTimeout = DEFAULT_CONNECT_TIMEOUT;
private int timeout = 0;
@@ -45,13 +47,15 @@ public abstract class SocketClient {
public void connect(InetAddress host, int port)
throws IOException {
socket = socketFactory.createSocket(new InetSocketAddress(host, port));
socket = socketFactory.createSocket();
socket.connect(new InetSocketAddress(host, port), connectTimeout);
onConnect();
}
public void connect(InetAddress host, int port, Proxy proxy)
throws IOException {
socket = socketFactory.createSocket(new InetSocketAddress(host, port), proxy);
socket = new Socket(proxy);
socket.connect(new InetSocketAddress(host, port), connectTimeout);
onConnect();
}
@@ -70,9 +74,9 @@ public abstract class SocketClient {
public void connect(InetAddress host, int port,
InetAddress localAddr, int localPort)
throws IOException {
InetSocketAddress bindpoint = new InetSocketAddress(localAddr, localPort);
InetSocketAddress endpoint = new InetSocketAddress(host, port);
socket = socketFactory.createSocket(bindpoint, endpoint);
socket = socketFactory.createSocket();
socket.bind(new InetSocketAddress(localAddr, localPort));
socket.connect(new InetSocketAddress(host, port), connectTimeout);
onConnect();
}
@@ -156,11 +160,11 @@ public abstract class SocketClient {
}
public int getConnectTimeout() {
return socketFactory.getConnectTimeout();
return connectTimeout;
}
public void setConnectTimeout(int connectTimeout) {
socketFactory.setConnectTimeout(connectTimeout);
this.connectTimeout = connectTimeout;
}
public int getTimeout() {