summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2015-06-30 05:23:26 +0000
committerDamien Miller <djm@cvs.openbsd.org>2015-06-30 05:23:26 +0000
commit2efebe796f9c0e69565e5601e71cebce6c5ad422 (patch)
tree272491435c151dac97ea05e30833407903c6bdd8
parentba061f10958f0edeb1bb670e21e1f42f560f24c0 (diff)
Fix math error in remote window calculations that causes eventual stalls
for datagram channels. Reported by Georg Wicherski, ok markus@
-rw-r--r--usr.bin/ssh/channels.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c
index 68e9c3509e5..8ac41c55075 100644
--- a/usr.bin/ssh/channels.c
+++ b/usr.bin/ssh/channels.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.c,v 1.344 2015/06/05 15:13:13 millert Exp $ */
+/* $OpenBSD: channels.c,v 1.345 2015/06/30 05:23:25 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2243,7 +2243,7 @@ channel_output_poll(void)
packet_put_int(c->remote_id);
packet_put_string(data, dlen);
packet_send();
- c->remote_window -= dlen + 4;
+ c->remote_window -= dlen;
free(data);
}
continue;