diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2015-06-30 07:23:25 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2015-06-30 08:12:20 +0200 |
| commit | f715afebe735d61df3fd30ad72d9ac1c8bd3b5f2 (patch) | |
| tree | 237fcebc29643134bb46452fd27f9685b6aa86c0 /channels.c | |
| parent | skip IPv6-related portions on hosts without IPv6 (diff) | |
| download | openssh-f715afebe735d61df3fd30ad72d9ac1c8bd3b5f2.tar.xz openssh-f715afebe735d61df3fd30ad72d9ac1c8bd3b5f2.zip | |
upstream commit
Fix math error in remote window calculations that causes
eventual stalls for datagram channels. Reported by Georg Wicherski, ok
markus@
Upstream-ID: be54059d11bf64e0d85061f7257f53067842e2ab
Diffstat (limited to 'channels.c')
| -rw-r--r-- | channels.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/channels.c b/channels.c index 45e1f9fcc..8069cf1f9 100644 --- a/channels.c +++ b/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 @@ -2270,7 +2270,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; |