diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2007-02-25 20:36:49 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2007-02-25 20:36:49 +1100 |
| commit | d04188e70e17b317076f4c7af3359dc439e43f0b (patch) | |
| tree | 90edcd971bb45128453b550fe605421d42d8845f | |
| parent | 89ee69e3c639b55b7577ba8fde66450446f74ea4 (diff) | |
- djm@cvs.openbsd.org 2007/02/20 10:25:14
[clientloop.c]
set maximum packet and window sizes the same for multiplexed clients
as normal connections; ok markus@
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | clientloop.c | 14 |
2 files changed, 18 insertions, 5 deletions
@@ -1,3 +1,10 @@ +20070225 + - (dtucker) OpenBSD CVS Sync + - djm@cvs.openbsd.org 2007/02/20 10:25:14 + [clientloop.c] + set maximum packet and window sizes the same for multiplexed clients + as normal connections; ok markus@ + 20070219 - (dtucker) OpenBSD CVS Sync - jmc@cvs.openbsd.org 2007/01/10 13:23:22 @@ -2742,4 +2749,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.4619 2007/02/19 11:56:55 dtucker Exp $ +$Id: ChangeLog,v 1.4620 2007/02/25 09:36:49 dtucker Exp $ diff --git a/clientloop.c b/clientloop.c index 0b6fbe88..c7362caa 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.177 2007/01/21 01:41:54 stevesk Exp $ */ +/* $OpenBSD: clientloop.c,v 1.178 2007/02/20 10:25:14 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -707,7 +707,7 @@ client_process_control(fd_set *readset) { Buffer m; Channel *c; - int client_fd, new_fd[3], ver, allowed; + int client_fd, new_fd[3], ver, allowed, window, packetmax; socklen_t addrlen; struct sockaddr_storage addr; struct confirm_ctx *cctx; @@ -900,9 +900,15 @@ client_process_control(fd_set *readset) set_nonblock(client_fd); + window = CHAN_SES_WINDOW_DEFAULT; + packetmax = CHAN_SES_PACKET_DEFAULT; + if (cctx->want_tty) { + window >>= 1; + packetmax >>= 1; + } + c = channel_new("session", SSH_CHANNEL_OPENING, - new_fd[0], new_fd[1], new_fd[2], - CHAN_SES_WINDOW_DEFAULT, CHAN_SES_PACKET_DEFAULT, + new_fd[0], new_fd[1], new_fd[2], window, packetmax, CHAN_EXTENDED_WRITE, "client-session", /*nonblock*/0); /* XXX */ |