diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2007-06-25 19:04:46 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2007-06-25 19:04:46 +1000 |
| commit | ae09cb8a7123416217e88a42c2c0ad04230d5314 (patch) | |
| tree | 12bcfe860047485a517ce0b75c579477f6c5ff61 | |
| parent | ab17f7d67b2decbd8561977a47fec55a9e74337e (diff) | |
- dtucker@cvs.openbsd.org 2007/06/25 08:20:03
[channels.c]
Correct test for window updates every three packets; prevents sending
window updates for every single packet. ok markus@
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | channels.c | 4 |
2 files changed, 7 insertions, 3 deletions
@@ -16,6 +16,10 @@ [atomicio.c] if the fd passed to atomicio/atomiciov() is non blocking, then poll() to avoid a spin if it is not yet ready for reading/writing; ok dtucker@ + - dtucker@cvs.openbsd.org 2007/06/25 08:20:03 + [channels.c] + Correct test for window updates every three packets; prevents sending + window updates for every single packet. ok markus@ 20070614 - (dtucker) [cipher-ctr.c umac.c openbsd-compat/openssl-compat.h] Move the @@ -3091,4 +3095,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4706 2007/06/25 09:04:12 dtucker Exp $ +$Id: ChangeLog,v 1.4707 2007/06/25 09:04:46 dtucker Exp $ @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.269 2007/06/11 08:04:44 markus Exp $ */ +/* $OpenBSD: channels.c,v 1.270 2007/06/25 08:20:03 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1657,7 +1657,7 @@ channel_check_window(Channel *c) { if (c->type == SSH_CHANNEL_OPEN && !(c->flags & (CHAN_CLOSE_SENT|CHAN_CLOSE_RCVD)) && - ((c->local_window_max - c->local_window < + ((c->local_window_max - c->local_window > c->local_maxpacket*3) || c->local_window < c->local_window_max/2) && c->local_consumed > 0) { |