diff options
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clientloop.c b/clientloop.c index 248c9541f..2934c4763 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.301 2017/07/14 03:18:21 dtucker Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.302 2017/08/30 03:59:08 djm 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 |
@@ -506,8 +506,8 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, | |||
506 | int ret; | 506 | int ret; |
507 | 507 | ||
508 | /* Add any selections by the channel mechanism. */ | 508 | /* Add any selections by the channel mechanism. */ |
509 | channel_prepare_select(readsetp, writesetp, maxfdp, nallocp, | 509 | channel_prepare_select(active_state, readsetp, writesetp, maxfdp, |
510 | &minwait_secs, rekeying); | 510 | nallocp, &minwait_secs); |
511 | 511 | ||
512 | /* channel_prepare_select could have closed the last channel */ | 512 | /* channel_prepare_select could have closed the last channel */ |
513 | if (session_closed && !channel_still_open() && | 513 | if (session_closed && !channel_still_open() && |
@@ -1353,7 +1353,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) | |||
1353 | 1353 | ||
1354 | /* Do channel operations unless rekeying in progress. */ | 1354 | /* Do channel operations unless rekeying in progress. */ |
1355 | if (!ssh_packet_is_rekeying(active_state)) | 1355 | if (!ssh_packet_is_rekeying(active_state)) |
1356 | channel_after_select(readset, writeset); | 1356 | channel_after_select(active_state, readset, writeset); |
1357 | 1357 | ||
1358 | /* Buffer input from the connection. */ | 1358 | /* Buffer input from the connection. */ |
1359 | client_process_net_input(readset); | 1359 | client_process_net_input(readset); |