diff options
Diffstat (limited to 'src/com/trilead')
10 files changed, 70 insertions, 21 deletions
diff --git a/src/com/trilead/ssh2/channel/DynamicAcceptThread.java b/src/com/trilead/ssh2/channel/DynamicAcceptThread.java index f3c8b07..ef3a3d0 100644 --- a/src/com/trilead/ssh2/channel/DynamicAcceptThread.java +++ b/src/com/trilead/ssh2/channel/DynamicAcceptThread.java @@ -202,7 +202,7 @@ public class DynamicAcceptThread extends Thread implements IChannelWorkerThread } try { - r2l = new StreamForwarder(cn, null, null, cn.stdoutStream, out, "RemoteToLocal"); + r2l = new StreamForwarder(cn, null, sock, cn.stdoutStream, out, "RemoteToLocal"); l2r = new StreamForwarder(cn, r2l, sock, in, cn.stdinStream, "LocalToRemote"); } catch (IOException e) { try { diff --git a/src/com/trilead/ssh2/channel/LocalAcceptThread.java b/src/com/trilead/ssh2/channel/LocalAcceptThread.java index 1b08d9c..885b41f 100644 --- a/src/com/trilead/ssh2/channel/LocalAcceptThread.java +++ b/src/com/trilead/ssh2/channel/LocalAcceptThread.java @@ -96,7 +96,7 @@ public class LocalAcceptThread extends Thread implements IChannelWorkerThread try
{
- r2l = new StreamForwarder(cn, null, null, cn.stdoutStream, s.getOutputStream(), "RemoteToLocal");
+ r2l = new StreamForwarder(cn, null, s, cn.stdoutStream, s.getOutputStream(), "RemoteToLocal");
l2r = new StreamForwarder(cn, r2l, s, s.getInputStream(), cn.stdinStream, "LocalToRemote");
}
catch (IOException e)
diff --git a/src/com/trilead/ssh2/channel/RemoteAcceptThread.java b/src/com/trilead/ssh2/channel/RemoteAcceptThread.java index 1ca9d76..8b97b55 100644 --- a/src/com/trilead/ssh2/channel/RemoteAcceptThread.java +++ b/src/com/trilead/ssh2/channel/RemoteAcceptThread.java @@ -52,7 +52,7 @@ public class RemoteAcceptThread extends Thread s = new Socket(targetAddress, targetPort);
- StreamForwarder r2l = new StreamForwarder(c, null, null, c.getStdoutStream(), s.getOutputStream(),
+ StreamForwarder r2l = new StreamForwarder(c, null, s, c.getStdoutStream(), s.getOutputStream(),
"RemoteToLocal");
StreamForwarder l2r = new StreamForwarder(c, null, null, s.getInputStream(), c.getStdinStream(),
"LocalToRemote");
diff --git a/src/com/trilead/ssh2/channel/RemoteX11AcceptThread.java b/src/com/trilead/ssh2/channel/RemoteX11AcceptThread.java index 8ee05a2..34ce51f 100644 --- a/src/com/trilead/ssh2/channel/RemoteX11AcceptThread.java +++ b/src/com/trilead/ssh2/channel/RemoteX11AcceptThread.java @@ -191,7 +191,7 @@ public class RemoteX11AcceptThread extends Thread /* Start forwarding traffic */
- StreamForwarder r2l = new StreamForwarder(c, null, null, remote_is, x11_os, "RemoteToX11");
+ StreamForwarder r2l = new StreamForwarder(c, null, s, remote_is, x11_os, "RemoteToX11");
StreamForwarder l2r = new StreamForwarder(c, null, null, x11_is, remote_os, "X11ToRemote");
/* No need to start two threads, one can be executed in the current thread */
diff --git a/src/com/trilead/ssh2/channel/StreamForwarder.java b/src/com/trilead/ssh2/channel/StreamForwarder.java index 376a3a0..7e54efb 100644 --- a/src/com/trilead/ssh2/channel/StreamForwarder.java +++ b/src/com/trilead/ssh2/channel/StreamForwarder.java @@ -17,13 +17,13 @@ import java.net.Socket; */
public class StreamForwarder extends Thread
{
- OutputStream os;
- InputStream is;
- byte[] buffer = new byte[Channel.CHANNEL_BUFFER_SIZE];
- Channel c;
- StreamForwarder sibling;
- Socket s;
- String mode;
+ final OutputStream os;
+ final InputStream is;
+ final byte[] buffer = new byte[Channel.CHANNEL_BUFFER_SIZE];
+ final Channel c;
+ final StreamForwarder sibling;
+ final Socket s;
+ final String mode;
StreamForwarder(Channel c, StreamForwarder sibling, Socket s, InputStream is, OutputStream os, String mode)
throws IOException
@@ -97,11 +97,12 @@ public class StreamForwarder extends Thread catch (IOException e3)
{
}
+ }
+ if (s != null) {
try
{
- if (s != null)
- s.close();
+ s.close();
}
catch (IOException e1)
{
@@ -109,4 +110,4 @@ public class StreamForwarder extends Thread }
}
}
-}
\ No newline at end of file +}
diff --git a/src/com/trilead/ssh2/compression/CompressionFactory.java b/src/com/trilead/ssh2/compression/CompressionFactory.java index a846f58..9f8d7ef 100644 --- a/src/com/trilead/ssh2/compression/CompressionFactory.java +++ b/src/com/trilead/ssh2/compression/CompressionFactory.java @@ -43,7 +43,7 @@ public class CompressionFactory { /* Higher Priority First */ compressors.addElement(new CompressorEntry("zlib", "com.trilead.ssh2.compression.Zlib")); - compressors.addElement(new CompressorEntry("zlib@openssh.com", "com.trilead.ssh2.compression.Zlib")); + compressors.addElement(new CompressorEntry("zlib@openssh.com", "com.trilead.ssh2.compression.ZlibOpenSSH")); compressors.addElement(new CompressorEntry("none", "")); } diff --git a/src/com/trilead/ssh2/compression/ICompressor.java b/src/com/trilead/ssh2/compression/ICompressor.java index 3f76326..0b435b9 100644 --- a/src/com/trilead/ssh2/compression/ICompressor.java +++ b/src/com/trilead/ssh2/compression/ICompressor.java @@ -27,4 +27,6 @@ public interface ICompressor { int compress(byte[] buf, int start, int len, byte[] output); byte[] uncompress(byte[] buf, int start, int[] len); + + boolean canCompressPreauth(); } diff --git a/src/com/trilead/ssh2/compression/Zlib.java b/src/com/trilead/ssh2/compression/Zlib.java index e9cc017..c1203a3 100644 --- a/src/com/trilead/ssh2/compression/Zlib.java +++ b/src/com/trilead/ssh2/compression/Zlib.java @@ -47,6 +47,10 @@ public class Zlib implements ICompressor { inflated_buf = new byte[DEFAULT_BUF_SIZE]; } + public boolean canCompressPreauth() { + return true; + } + public int getBufferSize() { return DEFAULT_BUF_SIZE; } diff --git a/src/com/trilead/ssh2/compression/ZlibOpenSSH.java b/src/com/trilead/ssh2/compression/ZlibOpenSSH.java new file mode 100644 index 0000000..266fff9 --- /dev/null +++ b/src/com/trilead/ssh2/compression/ZlibOpenSSH.java @@ -0,0 +1,35 @@ +/* + * ConnectBot: simple, powerful, open-source SSH client for Android + * Copyright 2007 Kenny Root, Jeffrey Sharkey + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.trilead.ssh2.compression; + +/** + * Defines how zlib@openssh.org compression works. + * See + * http://www.openssh.org/txt/draft-miller-secsh-compression-delayed-00.txt + * compression is disabled until userauth has occurred. + * + * @author Matt Johnston + * + */ +public class ZlibOpenSSH extends Zlib { + + public boolean canCompressPreauth() { + return false; + } + +} diff --git a/src/com/trilead/ssh2/transport/TransportConnection.java b/src/com/trilead/ssh2/transport/TransportConnection.java index 77eaded..2c04ce4 100644 --- a/src/com/trilead/ssh2/transport/TransportConnection.java +++ b/src/com/trilead/ssh2/transport/TransportConnection.java @@ -56,7 +56,9 @@ public class TransportConnection ICompressor send_comp = null;
- boolean can_compress = false;
+ boolean can_recv_compress = false;
+
+ boolean can_send_compress = false;
byte[] recv_comp_buffer;
@@ -117,16 +119,20 @@ public class TransportConnection {
recv_comp = comp;
- if (comp != null)
+ if (comp != null) {
recv_comp_buffer = new byte[comp.getBufferSize()];
+ can_recv_compress |= recv_comp.canCompressPreauth();
+ }
}
public void changeSendCompression(ICompressor comp)
{
send_comp = comp;
- if (comp != null)
+ if (comp != null) {
send_comp_buffer = new byte[comp.getBufferSize()];
+ can_send_compress |= send_comp.canCompressPreauth();
+ }
}
public void sendMessage(byte[] message) throws IOException
@@ -152,7 +158,7 @@ public class TransportConnection else if (padd > 64)
padd = 64;
- if (send_comp != null && can_compress) {
+ if (send_comp != null && can_send_compress) {
if (send_comp_buffer.length < message.length + 1024)
send_comp_buffer = new byte[message.length + 1024];
len = send_comp.compress(message, off, len, send_comp_buffer);
@@ -313,7 +319,7 @@ public class TransportConnection + " bytes payload");
}
- if (recv_comp != null && can_compress) {
+ if (recv_comp != null && can_recv_compress) {
int[] uncomp_len = new int[] { payload_length };
buffer = recv_comp.uncompress(buffer, off, uncomp_len);
@@ -331,6 +337,7 @@ public class TransportConnection *
*/
public void startCompression() {
- can_compress = true;
+ can_recv_compress = true;
+ can_send_compress = true;
}
}
|