- 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@
This commit is contained in:
parent
89ee69e3c6
commit
d04188e70e
|
@ -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
|
20070219
|
||||||
- (dtucker) OpenBSD CVS Sync
|
- (dtucker) OpenBSD CVS Sync
|
||||||
- jmc@cvs.openbsd.org 2007/01/10 13:23:22
|
- jmc@cvs.openbsd.org 2007/01/10 13:23:22
|
||||||
|
@ -2742,4 +2749,4 @@
|
||||||
OpenServer 6 and add osr5bigcrypt support so when someone migrates
|
OpenServer 6 and add osr5bigcrypt support so when someone migrates
|
||||||
passwords between UnixWare and OpenServer they will still work. OK dtucker@
|
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 $
|
||||||
|
|
14
clientloop.c
14
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>
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
||||||
|
@ -707,7 +707,7 @@ client_process_control(fd_set *readset)
|
||||||
{
|
{
|
||||||
Buffer m;
|
Buffer m;
|
||||||
Channel *c;
|
Channel *c;
|
||||||
int client_fd, new_fd[3], ver, allowed;
|
int client_fd, new_fd[3], ver, allowed, window, packetmax;
|
||||||
socklen_t addrlen;
|
socklen_t addrlen;
|
||||||
struct sockaddr_storage addr;
|
struct sockaddr_storage addr;
|
||||||
struct confirm_ctx *cctx;
|
struct confirm_ctx *cctx;
|
||||||
|
@ -900,9 +900,15 @@ client_process_control(fd_set *readset)
|
||||||
|
|
||||||
set_nonblock(client_fd);
|
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,
|
c = channel_new("session", SSH_CHANNEL_OPENING,
|
||||||
new_fd[0], new_fd[1], new_fd[2],
|
new_fd[0], new_fd[1], new_fd[2], window, packetmax,
|
||||||
CHAN_SES_WINDOW_DEFAULT, CHAN_SES_PACKET_DEFAULT,
|
|
||||||
CHAN_EXTENDED_WRITE, "client-session", /*nonblock*/0);
|
CHAN_EXTENDED_WRITE, "client-session", /*nonblock*/0);
|
||||||
|
|
||||||
/* XXX */
|
/* XXX */
|
||||||
|
|
Loading…
Reference in New Issue