diff options
| author |   djm <djm@openbsd.org> | 2017-08-30 03:59:08 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2017-08-30 03:59:08 +0000 |
| commit | 3c79e014f9f14c6c70365065bbe8723685e87fe1 (patch) | |
| tree | df7fdaadc63e07e63b620855bce34b7e5ef97b30 /usr.bin/ssh/serverloop.c | |
| parent | Remove unused variable; no binary change. (diff) | |
| download | wireguard-openbsd-3c79e014f9f14c6c70365065bbe8723685e87fe1.tar.xz wireguard-openbsd-3c79e014f9f14c6c70365065bbe8723685e87fe1.zip | |
pass packet state down to some of the channels function (more
to come...); ok markus@
Diffstat (limited to 'usr.bin/ssh/serverloop.c')
| -rw-r--r-- | usr.bin/ssh/serverloop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c index 44e05fa1d45..ced2d52bdad 100644 --- a/usr.bin/ssh/serverloop.c +++ b/usr.bin/ssh/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 @@ -201,8 +201,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) @@ -404,7 +404,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); |