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

no need to actually have API client specify sftp protocol version, so long as all versions < MAX_SUPPORTED_VERSIONS are supported. which is true for now!

Browse Source
This commit is contained in:
Shikhar Bhushan
2010-08-06 22:29:43 +01:00
parent 9a4a24737f
commit 974e88efb4
2 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/schmizz/sshj/SSHClient.java
View File

@@ -593,21 +593,8 @@ public class SSHClient
*/ */
public SFTPClient newSFTPClient() public SFTPClient newSFTPClient()
throws IOException { throws IOException {
return newSFTPClient(SFTPEngine.MAX_SUPPORTED_VERSION);
}
/**
* @param version the protocol version to use
*
* @return Instantiated {@link SFTPClient} implementation.
*
* @throws IOException if there is an error starting the {@code sftp} subsystem
* @see StatefulSFTPClient
*/
public SFTPClient newSFTPClient(int version)
throws IOException {
assert isConnected() && isAuthenticated(); assert isConnected() && isAuthenticated();
return new SFTPClient(new SFTPEngine(this, version).init()); return new SFTPClient(new SFTPEngine(this).init());
} }
/** /**

17
src/main/java/net/schmizz/sshj/sftp/SFTPEngine.java
View File

@@ -41,7 +41,6 @@ public class SFTPEngine
protected volatile int timeout = DEFAULT_TIMEOUT; protected volatile int timeout = DEFAULT_TIMEOUT;
protected final int clientVersion;
protected final Subsystem sub; protected final Subsystem sub;
protected final PacketReader reader; protected final PacketReader reader;
protected final OutputStream out; protected final OutputStream out;
@@ -52,14 +51,6 @@ public class SFTPEngine
public SFTPEngine(SessionFactory ssh) public SFTPEngine(SessionFactory ssh)
throws SSHException { throws SSHException {
this(ssh, MAX_SUPPORTED_VERSION);
}
public SFTPEngine(SessionFactory ssh, int clientVersion)
throws SSHException {
if (clientVersion > MAX_SUPPORTED_VERSION)
throw new SFTPException("Max. supported protocol version is: " + MAX_SUPPORTED_VERSION);
this.clientVersion = clientVersion;
sub = ssh.startSession().startSubsystem("sftp"); sub = ssh.startSession().startSubsystem("sftp");
out = sub.getOutputStream(); out = sub.getOutputStream();
reader = new PacketReader(this); reader = new PacketReader(this);
@@ -67,7 +58,7 @@ public class SFTPEngine
public SFTPEngine init() public SFTPEngine init()
throws IOException { throws IOException {
transmit(new SFTPPacket<Request>(PacketType.INIT).putInt(clientVersion)); transmit(new SFTPPacket<Request>(PacketType.INIT).putInt(MAX_SUPPORTED_VERSION));
final SFTPPacket<Response> response = reader.readPacket(); final SFTPPacket<Response> response = reader.readPacket();
@@ -76,9 +67,9 @@ public class SFTPEngine
throw new SFTPException("Expected INIT packet, received: " + type); throw new SFTPException("Expected INIT packet, received: " + type);
operativeVersion = response.readInt(); operativeVersion = response.readInt();
log.info("Client version {}, server version {}", clientVersion, operativeVersion); log.info("Server version {}", operativeVersion);
if (clientVersion < operativeVersion) if (MAX_SUPPORTED_VERSION < operativeVersion)
throw new SFTPException("Server reported protocol version: " + operativeVersion); throw new SFTPException("Server reported incompatible protocol version: " + operativeVersion);
while (response.available() > 0) while (response.available() > 0)
serverExtensions.put(response.readString(), response.readString()); serverExtensions.put(response.readString(), response.readString());