diff options
author | Colin Watson <cjwatson@debian.org> | 2008-02-01 21:53:32 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2008-02-01 21:53:32 +0000 |
commit | d577a83a31e9938ca46fe15ef0bfb2b09722832a (patch) | |
tree | 387da5bf6b739679f87bcf080923187ef477bff4 /clientloop.c | |
parent | 9984cafa631d79c7dc2a0da37c2f04433ee21137 (diff) |
* Backport from upstream:
- Use the correct packet maximum sizes for remote port and agent
forwarding. Prevents the server from killing the connection if too
much data is queued and an excessively large packet gets sent
(https://bugzilla.mindrot.org/show_bug.cgi?id=1360).
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/clientloop.c b/clientloop.c index aa8697900..7037c4192 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1726,7 +1726,7 @@ client_request_forwarded_tcpip(const char *request_type, int rchan) | |||
1726 | } | 1726 | } |
1727 | c = channel_new("forwarded-tcpip", | 1727 | c = channel_new("forwarded-tcpip", |
1728 | SSH_CHANNEL_CONNECTING, sock, sock, -1, | 1728 | SSH_CHANNEL_CONNECTING, sock, sock, -1, |
1729 | CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, | 1729 | CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, |
1730 | originator_address, 1); | 1730 | originator_address, 1); |
1731 | xfree(originator_address); | 1731 | xfree(originator_address); |
1732 | xfree(listen_address); | 1732 | xfree(listen_address); |
@@ -1784,7 +1784,7 @@ client_request_agent(const char *request_type, int rchan) | |||
1784 | return NULL; | 1784 | return NULL; |
1785 | c = channel_new("authentication agent connection", | 1785 | c = channel_new("authentication agent connection", |
1786 | SSH_CHANNEL_OPEN, sock, sock, -1, | 1786 | SSH_CHANNEL_OPEN, sock, sock, -1, |
1787 | CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, | 1787 | CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, |
1788 | "authentication agent connection", 1); | 1788 | "authentication agent connection", 1); |
1789 | c->force_drain = 1; | 1789 | c->force_drain = 1; |
1790 | return c; | 1790 | return c; |