- markus@cvs.openbsd.org 2001/04/29 18:32:52
[serverloop.c] fix whitespace
This commit is contained in:
parent
d240122ee8
commit
2f0304c768
|
@ -1,3 +1,9 @@
|
||||||
|
20010450
|
||||||
|
- OpenBSD CVS Sync
|
||||||
|
- markus@cvs.openbsd.org 2001/04/29 18:32:52
|
||||||
|
[serverloop.c]
|
||||||
|
fix whitespace
|
||||||
|
|
||||||
20010429
|
20010429
|
||||||
- (bal) Updated INSTALL. PCRE moved to a new place.
|
- (bal) Updated INSTALL. PCRE moved to a new place.
|
||||||
- (djm) Release OpenSSH-2.9p1
|
- (djm) Release OpenSSH-2.9p1
|
||||||
|
@ -5271,4 +5277,4 @@
|
||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.1180 2001/04/29 10:45:50 djm Exp $
|
$Id: ChangeLog,v 1.1181 2001/04/29 19:49:14 mouring Exp $
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: serverloop.c,v 1.61 2001/04/13 22:46:54 beck Exp $");
|
RCSID("$OpenBSD: serverloop.c,v 1.62 2001/04/29 18:32:52 markus Exp $");
|
||||||
|
|
||||||
#include "xmalloc.h"
|
#include "xmalloc.h"
|
||||||
#include "packet.h"
|
#include "packet.h"
|
||||||
|
@ -203,10 +203,10 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
|
||||||
* analysis more difficult, but we're not doing it yet.
|
* analysis more difficult, but we're not doing it yet.
|
||||||
*/
|
*/
|
||||||
if (max_time_milliseconds == 0 && options.client_alive_interval) {
|
if (max_time_milliseconds == 0 && options.client_alive_interval) {
|
||||||
client_alive_scheduled = 1;
|
client_alive_scheduled = 1;
|
||||||
max_time_milliseconds = options.client_alive_interval * 1000;
|
max_time_milliseconds = options.client_alive_interval * 1000;
|
||||||
} else
|
} else
|
||||||
client_alive_scheduled = 0;
|
client_alive_scheduled = 0;
|
||||||
|
|
||||||
/* When select fails we restart from here. */
|
/* When select fails we restart from here. */
|
||||||
retry_select:
|
retry_select:
|
||||||
|
@ -746,7 +746,7 @@ server_input_channel_failure(int type, int plen, void *ctxt)
|
||||||
{
|
{
|
||||||
debug("Got CHANNEL_FAILURE for keepalive");
|
debug("Got CHANNEL_FAILURE for keepalive");
|
||||||
/*
|
/*
|
||||||
* reset timeout, since we got a sane answer from the client.
|
* reset timeout, since we got a sane answer from the client.
|
||||||
* even if this was generated by something other than
|
* even if this was generated by something other than
|
||||||
* the bogus CHANNEL_REQUEST we send for keepalives.
|
* the bogus CHANNEL_REQUEST we send for keepalives.
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue