Attachment 23 Details for Bug 105 – like this

[patch] like this

chan-size (text/plain), 3.27 KB, created by Markus Friedl on 2002-02-13 10:00:23 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Markus Friedl

Created: 2002-02-13 10:00:23 AEDT

Size: 3.27 KB

patch

obsolete

>Index: channels.c
>===================================================================
>RCS file: /cvs/openssh_cvs/channels.c,v
>retrieving revision 1.111
>diff -u -r1.111 channels.c
>--- channels.c	12 Oct 2001 01:35:05 -0000	1.111
>+++ channels.c	12 Feb 2002 22:51:00 -0000
>@@ -651,15 +651,14 @@
> 
> void
> channel_set_fds(int id, int rfd, int wfd, int efd,
>-    int extusage, int nonblock)
>+    int extusage, int nonblock, u_int window_max)
> {
> 	Channel *c = channel_lookup(id);
> 	if (c == NULL || c->type != SSH_CHANNEL_LARVAL)
> 		fatal("channel_activate for non-larval channel %d.", id);
> 	channel_register_fds(c, rfd, wfd, efd, extusage, nonblock);
> 	c->type = SSH_CHANNEL_OPEN;
>-	/* XXX window size? */
>-	c->local_window = c->local_window_max = c->local_maxpacket * 2;
>+	c->local_window = c->local_window_max = window_max;
> 	packet_start(SSH2_MSG_CHANNEL_WINDOW_ADJUST);
> 	packet_put_int(c->remote_id);
> 	packet_put_int(c->local_window);
>Index: channels.h
>===================================================================
>RCS file: /cvs/openssh_cvs/channels.h,v
>retrieving revision 1.43
>diff -u -r1.43 channels.h
>--- channels.h	12 Nov 2001 00:04:55 -0000	1.43
>+++ channels.h	12 Feb 2002 22:51:01 -0000
>@@ -114,12 +114,12 @@
> #define CHAN_EXTENDED_WRITE		2
> 
> /* default window/packet sizes for tcp/x11-fwd-channel */
>-#define CHAN_SES_WINDOW_DEFAULT	(32*1024)
>-#define CHAN_SES_PACKET_DEFAULT	(CHAN_SES_WINDOW_DEFAULT/2)
>-#define CHAN_TCP_WINDOW_DEFAULT	(32*1024)
>-#define CHAN_TCP_PACKET_DEFAULT	(CHAN_TCP_WINDOW_DEFAULT/2)
>-#define CHAN_X11_WINDOW_DEFAULT	(4*1024)
>-#define CHAN_X11_PACKET_DEFAULT	(CHAN_X11_WINDOW_DEFAULT/2)
>+#define CHAN_SES_PACKET_DEFAULT	(32*1024)
>+#define CHAN_SES_WINDOW_DEFAULT	(4*CHAN_SES_PACKET_DEFAULT)
>+#define CHAN_TCP_PACKET_DEFAULT	(32*1024)
>+#define CHAN_TCP_WINDOW_DEFAULT	(4*CHAN_TCP_PACKET_DEFAULT)
>+#define CHAN_X11_PACKET_DEFAULT	(16*1024)
>+#define CHAN_X11_WINDOW_DEFAULT	(4*CHAN_X11_PACKET_DEFAULT)
> 
> /* possible input states */
> #define CHAN_INPUT_OPEN			0x01
>@@ -140,7 +140,7 @@
> 
> Channel	*channel_lookup(int);
> Channel *channel_new(char *, int, int, int, int, int, int, int, char *, int);
>-void	 channel_set_fds(int, int, int, int, int, int);
>+void	 channel_set_fds(int, int, int, int, int, int, u_int);
> void	 channel_free(Channel *);
> void	 channel_free_all(void);
> void	 channel_stop_listening(void);
>Index: session.c
>===================================================================
>RCS file: /cvs/openssh_cvs/session.c,v
>retrieving revision 1.156.4.1
>diff -u -r1.156.4.1 session.c
>--- session.c	1 Dec 2001 23:37:08 -0000	1.156.4.1
>+++ session.c	12 Feb 2002 22:51:04 -0000
>@@ -1843,7 +1843,8 @@
> 	channel_set_fds(s->chanid,
> 	    fdout, fdin, fderr,
> 	    fderr == -1 ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ,
>-	    1);
>+	    1,
>+	    CHAN_SES_WINDOW_DEFAULT);
> }
> 
> /*
>Index: ssh.c
>===================================================================
>RCS file: /cvs/openssh_cvs/ssh.c,v
>retrieving revision 1.124
>diff -u -r1.124 ssh.c
>--- ssh.c	11 Nov 2001 23:52:04 -0000	1.124
>+++ ssh.c	12 Feb 2002 22:51:07 -0000
>@@ -1130,9 +1130,9 @@
> 
> 	window = CHAN_SES_WINDOW_DEFAULT;
> 	packetmax = CHAN_SES_PACKET_DEFAULT;
>-	if (!tty_flag) {
>-		window *= 2;
>-		packetmax *=2;
>+	if (tty_flag) {
>+		window >>= 1;
>+		packetmax >>= 1;
> 	}
> 	c = channel_new(
> 	    "session", SSH_CHANNEL_OPENING, in, out, err,

Actions: View | Diff

Attachments on bug 105: 23