diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2017-08-30 03:59:08 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2017-09-04 09:38:57 +1000 |
| commit | 71e5a536ec815d542b199f2ae6d646c0db9f1b58 (patch) | |
| tree | e5b03199a74b43fa69af7a047b2480a132d69e80 /clientloop.c | |
| parent | 6227fe5b362239c872b91bbdee4bf63cf85aebc5 (diff) | |
upstream commit
pass packet state down to some of the channels function
(more to come...); ok markus@
Upstream-ID: d8ce7a94f4059d7ac1e01fb0eb01de0c4b36c81b
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 248c9541..2934c476 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.301 2017/07/14 03:18:21 dtucker Exp $ */ +/* $OpenBSD: clientloop.c,v 1.302 2017/08/30 03:59:08 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * 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, int ret; /* Add any selections by the channel mechanism. */ - channel_prepare_select(readsetp, writesetp, maxfdp, nallocp, - &minwait_secs, rekeying); + channel_prepare_select(active_state, readsetp, writesetp, maxfdp, + nallocp, &minwait_secs); /* channel_prepare_select could have closed the last channel */ if (session_closed && !channel_still_open() && @@ -1353,7 +1353,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) /* Do channel operations unless rekeying in progress. */ if (!ssh_packet_is_rekeying(active_state)) - channel_after_select(readset, writeset); + channel_after_select(active_state, readset, writeset); /* Buffer input from the connection. */ client_process_net_input(readset); |