You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by gn...@apache.org on 2009/11/20 11:53:20 UTC
svn commit: r882494 - in /mina/sshd/trunk/sshd-core/src:
main/java/org/apache/sshd/common/channel/Window.java
test/java/org/apache/sshd/LoadTest.java
Author: gnodet
Date: Fri Nov 20 10:53:19 2009
New Revision: 882494
URL: http://svn.apache.org/viewvc?rev=882494&view=rev
Log:
SSHD-64: Logic error on the client side window for channels
Modified:
mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java
mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/LoadTest.java
Modified: mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java?rev=882494&r1=882493&r2=882494&view=diff
==============================================================================
--- mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java (original)
+++ mina/sshd/trunk/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java Fri Nov 20 10:53:19 2009
@@ -106,9 +106,8 @@
}
public void check(int maxFree) throws IOException {
- int threshold = Math.min(packetSize * 8, maxSize / 4);
synchronized (lock) {
- if ((maxFree - size) > packetSize && (maxFree - size > threshold || size < threshold)) {
+ if ((size < maxFree) && (maxFree - size > packetSize * 3 || size < maxFree / 2)) {
if (log.isDebugEnabled()) {
log.debug("Increase " + name + " by " + (maxFree - size) + " up to " + maxFree);
}
Modified: mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/LoadTest.java
URL: http://svn.apache.org/viewvc/mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/LoadTest.java?rev=882494&r1=882493&r2=882494&view=diff
==============================================================================
--- mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/LoadTest.java (original)
+++ mina/sshd/trunk/sshd-core/src/test/java/org/apache/sshd/LoadTest.java Fri Nov 20 10:53:19 2009
@@ -106,6 +106,8 @@
protected void runClient(String msg) throws Exception {
SshClient client = SshClient.setUpDefaultClient();
+ client.getProperties().put(SshClient.MAX_PACKET_SIZE, Integer.toString(1024 * 16));
+ client.getProperties().put(SshClient.WINDOW_SIZE, Integer.toString(1024 * 8));
client.setKeyExchangeFactories(Arrays.<NamedFactory<KeyExchange>>asList(
new DHG1.Factory()));
client.setCipherFactories(Arrays.<NamedFactory<Cipher>>asList(