summaryrefslogtreecommitdiff
path: root/channels.c
diff options
context:
space:
mode:
Diffstat (limited to 'channels.c')
-rw-r--r--channels.c22
1 files changed, 17 insertions, 5 deletions
diff --git a/channels.c b/channels.c
index 14405bd4b..e663c2159 100644
--- a/channels.c
+++ b/channels.c
@@ -39,7 +39,7 @@
39 */ 39 */
40 40
41#include "includes.h" 41#include "includes.h"
42RCSID("$OpenBSD: channels.c,v 1.199 2003/12/02 17:01:14 markus Exp $"); 42RCSID("$OpenBSD: channels.c,v 1.200 2004/01/19 09:24:21 markus Exp $");
43 43
44#include "ssh.h" 44#include "ssh.h"
45#include "ssh1.h" 45#include "ssh1.h"
@@ -1817,13 +1817,25 @@ channel_input_data(int type, u_int32_t seq, void *ctxt)
1817 c->type != SSH_CHANNEL_X11_OPEN) 1817 c->type != SSH_CHANNEL_X11_OPEN)
1818 return; 1818 return;
1819 1819
1820 /* same for protocol 1.5 if output end is no longer open */
1821 if (!compat13 && c->ostate != CHAN_OUTPUT_OPEN)
1822 return;
1823
1824 /* Get the data. */ 1820 /* Get the data. */
1825 data = packet_get_string(&data_len); 1821 data = packet_get_string(&data_len);
1826 1822
1823 /*
1824 * Ignore data for protocol > 1.3 if output end is no longer open.
1825 * For protocol 2 the sending side is reducing its window as it sends
1826 * data, so we must 'fake' consumption of the data in order to ensure
1827 * that window updates are sent back. Otherwise the connection might
1828 * deadlock.
1829 */
1830 if (!compat13 && c->ostate != CHAN_OUTPUT_OPEN) {
1831 if (compat20) {
1832 c->local_window -= data_len;
1833 c->local_consumed += data_len;
1834 }
1835 xfree(data);
1836 return;
1837 }
1838
1827 if (compat20) { 1839 if (compat20) {
1828 if (data_len > c->local_maxpacket) { 1840 if (data_len > c->local_maxpacket) {
1829 logit("channel %d: rcvd big packet %d, maxpack %d", 1841 logit("channel %d: rcvd big packet %d, maxpack %d",