summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2007-12-29 09:37:10 +1100
committerDarren Tucker <dtucker@zip.com.au>2007-12-29 09:37:10 +1100
commit5baa170d771de9e95cf30b4c469ece684244cf3e (patch)
treec2dbc80bf168ae6efdff574a141046e3de8fff77
parentd6725f04e296135732e9366a762222a3f3fd801f (diff)
- dtucker@cvs.openbsd.org 2007/12/28 22:34:47
[clientloop.c] 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. bz #1360, ok djm@.
-rw-r--r--ChangeLog7
-rw-r--r--clientloop.c6
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f583bc7ef..b32b72157 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,11 @@
16 ServerAlive and ClientAlive timers. Prevents dropping a connection 16 ServerAlive and ClientAlive timers. Prevents dropping a connection
17 when these are enabled but the peer does not support our keepalives. 17 when these are enabled but the peer does not support our keepalives.
18 bz #1307, ok djm@. 18 bz #1307, ok djm@.
19 - dtucker@cvs.openbsd.org 2007/12/28 22:34:47
20 [clientloop.c]
21 Use the correct packet maximum sizes for remote port and agent forwarding.
22 Prevents the server from killing the connection if too much data is queued
23 and an excessively large packet gets sent. bz #1360, ok djm@.
19 24
2020071202 2520071202
21 - (dtucker) [configure.ac] Enable -fstack-protector-all on systems where 26 - (dtucker) [configure.ac] Enable -fstack-protector-all on systems where
@@ -3477,4 +3482,4 @@
3477 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3482 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3478 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3483 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3479 3484
3480$Id: ChangeLog,v 1.4809 2007/12/28 15:45:07 dtucker Exp $ 3485$Id: ChangeLog,v 1.4810 2007/12/28 22:37:10 dtucker Exp $
diff --git a/clientloop.c b/clientloop.c
index 38ff614a9..109df4cac 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.184 2007/12/28 15:32:24 dtucker Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.185 2007/12/28 22:34:47 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1745,7 +1745,7 @@ client_request_forwarded_tcpip(const char *request_type, int rchan)
1745 } 1745 }
1746 c = channel_new("forwarded-tcpip", 1746 c = channel_new("forwarded-tcpip",
1747 SSH_CHANNEL_CONNECTING, sock, sock, -1, 1747 SSH_CHANNEL_CONNECTING, sock, sock, -1,
1748 CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, 1748 CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0,
1749 originator_address, 1); 1749 originator_address, 1);
1750 xfree(originator_address); 1750 xfree(originator_address);
1751 xfree(listen_address); 1751 xfree(listen_address);
@@ -1803,7 +1803,7 @@ client_request_agent(const char *request_type, int rchan)
1803 return NULL; 1803 return NULL;
1804 c = channel_new("authentication agent connection", 1804 c = channel_new("authentication agent connection",
1805 SSH_CHANNEL_OPEN, sock, sock, -1, 1805 SSH_CHANNEL_OPEN, sock, sock, -1,
1806 CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0, 1806 CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0,
1807 "authentication agent connection", 1); 1807 "authentication agent connection", 1);
1808 c->force_drain = 1; 1808 c->force_drain = 1;
1809 return c; 1809 return c;