diff options
author | djm <djm> | 2012-04-22 01:21:10 +0000 |
---|---|---|
committer | djm <djm> | 2012-04-22 01:21:10 +0000 |
commit | 84cfdc9f5776f096938d977bb4675adfff287a2f (patch) | |
tree | 2bfa037b207973c18adcac37d6e44bbdb74acbe2 /channels.h | |
parent | 7a926575f9cf0b7e573d69614fd44bd7446198f0 (diff) | |
download | openssh-84cfdc9f5776f096938d977bb4675adfff287a2f.tar.gz |
- djm@cvs.openbsd.org 2012/04/11 13:16:19
[channels.c channels.h clientloop.c serverloop.c]
don't spin in accept() when out of fds (ENFILE/ENFILE) - back off for a
while; ok deraadt@ markus@
Diffstat (limited to 'channels.h')
-rw-r--r-- | channels.h | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: channels.h,v 1.110 2012/03/29 23:54:36 dtucker Exp $ */ +/* $OpenBSD: channels.h,v 1.111 2012/04/11 13:16:19 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -105,6 +105,7 @@ struct Channel { int wfd_isatty; /* wfd is a tty */ int client_tty; /* (client) TTY has been requested */ int force_drain; /* force close on iEOF */ + time_t notbefore; /* Pause IO until deadline (time_t) */ int delayed; /* post-select handlers for newly created * channels are delayed until the first call * to a matching pre-select handler. @@ -238,7 +239,8 @@ void channel_input_status_confirm(int, u_int32_t, void *); /* file descriptor handling (read/write) */ -void channel_prepare_select(fd_set **, fd_set **, int *, u_int*, int); +void channel_prepare_select(fd_set **, fd_set **, int *, u_int*, + time_t*, int); void channel_after_select(fd_set *, fd_set *); void channel_output_poll(void); |