summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--channels.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 07ee5e927..43d5e365b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,10 @@
16 [atomicio.c] 16 [atomicio.c]
17 if the fd passed to atomicio/atomiciov() is non blocking, then poll() to 17 if the fd passed to atomicio/atomiciov() is non blocking, then poll() to
18 avoid a spin if it is not yet ready for reading/writing; ok dtucker@ 18 avoid a spin if it is not yet ready for reading/writing; ok dtucker@
19 - dtucker@cvs.openbsd.org 2007/06/25 08:20:03
20 [channels.c]
21 Correct test for window updates every three packets; prevents sending
22 window updates for every single packet. ok markus@
19 23
2020070614 2420070614
21 - (dtucker) [cipher-ctr.c umac.c openbsd-compat/openssl-compat.h] Move the 25 - (dtucker) [cipher-ctr.c umac.c openbsd-compat/openssl-compat.h] Move the
@@ -3091,4 +3095,4 @@
3091 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3095 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3092 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3096 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3093 3097
3094$Id: ChangeLog,v 1.4706 2007/06/25 09:04:12 dtucker Exp $ 3098$Id: ChangeLog,v 1.4707 2007/06/25 09:04:46 dtucker Exp $
diff --git a/channels.c b/channels.c
index 1d5b1f108..2006353d4 100644
--- a/channels.c
+++ b/channels.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.c,v 1.269 2007/06/11 08:04:44 markus Exp $ */ 1/* $OpenBSD: channels.c,v 1.270 2007/06/25 08:20:03 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1657,7 +1657,7 @@ channel_check_window(Channel *c)
1657{ 1657{
1658 if (c->type == SSH_CHANNEL_OPEN && 1658 if (c->type == SSH_CHANNEL_OPEN &&
1659 !(c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD)) && 1659 !(c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD)) &&
1660 ((c->local_window_max - c->local_window < 1660 ((c->local_window_max - c->local_window >
1661 c->local_maxpacket*3) || 1661 c->local_maxpacket*3) ||
1662 c->local_window < c->local_window_max/2) && 1662 c->local_window < c->local_window_max/2) &&
1663 c->local_consumed > 0) { 1663 c->local_consumed > 0) {