upstream commit

pass packet state down to some of the channels function
(more to come...); ok markus@

Upstream-ID: d8ce7a94f4059d7ac1e01fb0eb01de0c4b36c81b

1 files changed, 4 insertions, 4 deletions

diff --git a/serverloop.c b/serverloop.c
index 5cc3fc099..bc56709b1 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: serverloop.c,v 1.195 2017/08/11 04:16:35 dtucker Exp $ */
+/* $OpenBSD: serverloop.c,v 1.196 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
@@ -207,8 +207,8 @@ wait_until_can_do_something(int connection_in, int connection_out,
         static time_t last_client_time;
 
         /* Allocate and update select() masks for channel descriptors. */
-        channel_prepare_select(readsetp, writesetp, maxfdp, nallocp,
-            &minwait_secs, 0);
+        channel_prepare_select(active_state, readsetp, writesetp, maxfdp,
+            nallocp, &minwait_secs);
 
         /* XXX need proper deadline system for rekey/client alive */
         if (minwait_secs != 0)
@@ -411,7 +411,7 @@ server_loop2(Authctxt *authctxt)
 
                 collect_children();
                 if (!ssh_packet_is_rekeying(active_state))
-                        channel_after_select(readset, writeset);
+                        channel_after_select(active_state, readset, writeset);
                 if (process_input(readset, connection_in) < 0)
                         break;
                 process_output(writeset, connection_out);