summaryrefslogtreecommitdiff
path: root/clientloop.c
diff options
context:
space:
mode:
Diffstat (limited to 'clientloop.c')
-rw-r--r--clientloop.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/clientloop.c b/clientloop.c
index 83b2d4d8e..41aff8354 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
59 */ 59 */
60 60
61#include "includes.h" 61#include "includes.h"
62RCSID("$OpenBSD: clientloop.c,v 1.80 2001/06/30 18:08:40 stevesk Exp $"); 62RCSID("$OpenBSD: clientloop.c,v 1.81 2001/07/17 21:04:57 markus Exp $");
63 63
64#include "ssh.h" 64#include "ssh.h"
65#include "ssh1.h" 65#include "ssh1.h"
@@ -318,10 +318,10 @@ client_check_window_change(void)
318 318
319static void 319static void
320client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, 320client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
321 int *maxfdp, int rekeying) 321 int *maxfdp, int *nallocp, int rekeying)
322{ 322{
323 /* Add any selections by the channel mechanism. */ 323 /* Add any selections by the channel mechanism. */
324 channel_prepare_select(readsetp, writesetp, maxfdp, rekeying); 324 channel_prepare_select(readsetp, writesetp, maxfdp, nallocp, rekeying);
325 325
326 if (!compat20) { 326 if (!compat20) {
327 /* Read from the connection, unless our buffers are full. */ 327 /* Read from the connection, unless our buffers are full. */
@@ -770,7 +770,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
770{ 770{
771 fd_set *readset = NULL, *writeset = NULL; 771 fd_set *readset = NULL, *writeset = NULL;
772 double start_time, total_time; 772 double start_time, total_time;
773 int max_fd = 0, len, rekeying = 0; 773 int max_fd = 0, max_fd2 = 0, len, rekeying = 0, nalloc = 0;
774 char buf[100]; 774 char buf[100];
775 775
776 debug("Entering interactive session."); 776 debug("Entering interactive session.");
@@ -877,8 +877,9 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
877 * Wait until we have something to do (something becomes 877 * Wait until we have something to do (something becomes
878 * available on one of the descriptors). 878 * available on one of the descriptors).
879 */ 879 */
880 max_fd2 = max_fd;
880 client_wait_until_can_do_something(&readset, &writeset, 881 client_wait_until_can_do_something(&readset, &writeset,
881 &max_fd, rekeying); 882 &max_fd2, &nalloc, rekeying);
882 883
883 if (quit_pending) 884 if (quit_pending)
884 break; 885 break;