summaryrefslogtreecommitdiff
path: root/serverloop.c
diff options
context:
space:
mode:
Diffstat (limited to 'serverloop.c')
-rw-r--r--serverloop.c8
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 @@
1/* $OpenBSD: serverloop.c,v 1.195 2017/08/11 04:16:35 dtucker Exp $ */ 1/* $OpenBSD: serverloop.c,v 1.196 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
@@ -207,8 +207,8 @@ wait_until_can_do_something(int connection_in, int connection_out,
207 static time_t last_client_time; 207 static time_t last_client_time;
208 208
209 /* Allocate and update select() masks for channel descriptors. */ 209 /* Allocate and update select() masks for channel descriptors. */
210 channel_prepare_select(readsetp, writesetp, maxfdp, nallocp, 210 channel_prepare_select(active_state, readsetp, writesetp, maxfdp,
211 &minwait_secs, 0); 211 nallocp, &minwait_secs);
212 212
213 /* XXX need proper deadline system for rekey/client alive */ 213 /* XXX need proper deadline system for rekey/client alive */
214 if (minwait_secs != 0) 214 if (minwait_secs != 0)
@@ -411,7 +411,7 @@ server_loop2(Authctxt *authctxt)
411 411
412 collect_children(); 412 collect_children();
413 if (!ssh_packet_is_rekeying(active_state)) 413 if (!ssh_packet_is_rekeying(active_state))
414 channel_after_select(readset, writeset); 414 channel_after_select(active_state, readset, writeset);
415 if (process_input(readset, connection_in) < 0) 415 if (process_input(readset, connection_in) < 0)
416 break; 416 break;
417 process_output(writeset, connection_out); 417 process_output(writeset, connection_out);