Updated Branches: refs/heads/master 9037ce068 -> 29262ca3d
[SSHD-112] Allow up to 64k buffers Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/9c32a1fb Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/9c32a1fb Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/9c32a1fb Branch: refs/heads/master Commit: 9c32a1fbb2905d08c98b1e687827568192fab2f6 Parents: 9037ce0 Author: Guillaume Nodet <[email protected]> Authored: Tue Jul 23 18:51:59 2013 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Tue Jul 23 18:51:59 2013 +0200 ---------------------------------------------------------------------- .../java/org/apache/sshd/common/channel/AbstractChannel.java | 4 ++-- sshd-core/src/main/java/org/apache/sshd/common/util/Buffer.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9c32a1fb/sshd-core/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java index ae2a9e1..71d9fa4 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/AbstractChannel.java @@ -152,7 +152,7 @@ public abstract class AbstractChannel implements Channel { public void handleData(Buffer buffer) throws IOException { int len = buffer.getInt(); - if (len < 0 || len > 32768) { + if (len < 0 || len > Buffer.MAX_LEN) { throw new IllegalStateException("Bad item length: " + len); } log.debug("Received SSH_MSG_CHANNEL_DATA on channel {}", id); @@ -173,7 +173,7 @@ public abstract class AbstractChannel implements Channel { return; } int len = buffer.getInt(); - if (len < 0 || len > 32768) { + if (len < 0 || len > Buffer.MAX_LEN) { throw new IllegalStateException("Bad item length: " + len); } log.debug("Received SSH_MSG_CHANNEL_EXTENDED_DATA on channel {}", id); http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/9c32a1fb/sshd-core/src/main/java/org/apache/sshd/common/util/Buffer.java ---------------------------------------------------------------------- diff --git a/sshd-core/src/main/java/org/apache/sshd/common/util/Buffer.java b/sshd-core/src/main/java/org/apache/sshd/common/util/Buffer.java index b7ce1f2..80dfe17 100644 --- a/sshd-core/src/main/java/org/apache/sshd/common/util/Buffer.java +++ b/sshd-core/src/main/java/org/apache/sshd/common/util/Buffer.java @@ -48,6 +48,7 @@ import org.apache.sshd.common.SshException; public final class Buffer { public static final int DEFAULT_SIZE = 256; + public static final int MAX_LEN = 65536; private byte[] data; private int rpos; @@ -184,7 +185,7 @@ public final class Buffer { public String getString() { int len = getInt(); - if (len < 0 || len > 32768) { + if (len < 0 || len > MAX_LEN) { throw new IllegalStateException("Bad item length: " + len); } ensureAvailable(len); @@ -207,7 +208,7 @@ public final class Buffer { public byte[] getBytes() { int len = getInt(); - if (len < 0 || len > 32768) { + if (len < 0 || len > MAX_LEN) { throw new IllegalStateException("Bad item length: " + len); } byte[] b = new byte[len];
