summaryrefslogtreecommitdiff
path: root/serverloop.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-12-21 14:45:46 +1100
committerDamien Miller <djm@mindrot.org>2001-12-21 14:45:46 +1100
commit9f0f5c64bc4b6144e3fed6a7f538f7c21819a492 (patch)
treef79317ab211f59181a61b526f566e9c8cfe70c73 /serverloop.c
parent89681214ca2f50a1b1ed6164c3afe1ce14995ffc (diff)
- deraadt@cvs.openbsd.org 2001/12/19 07:18:56
[auth1.c auth2.c auth2-chall.c auth-bsdauth.c auth.c authfile.c auth.h] [auth-krb4.c auth-rhosts.c auth-skey.c bufaux.c canohost.c channels.c] [cipher.c clientloop.c compat.c compress.c deattack.c key.c log.c mac.c] [match.c misc.c nchan.c packet.c readconf.c rijndael.c rijndael.h scard.c] [servconf.c servconf.h serverloop.c session.c sftp.c sftp-client.c] [sftp-glob.c sftp-int.c sftp-server.c ssh-add.c ssh-agent.c ssh.c] [sshconnect1.c sshconnect2.c sshconnect.c sshd.8 sshd.c sshd_config] [ssh-keygen.c sshlogin.c sshpty.c sshtty.c ttymodes.c uidswap.c] basic KNF done while i was looking for something else
Diffstat (limited to 'serverloop.c')
-rw-r--r--serverloop.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/serverloop.c b/serverloop.c
index fd051070d..1fa1f5800 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: serverloop.c,v 1.85 2001/12/05 03:50:01 itojun Exp $"); 38RCSID("$OpenBSD: serverloop.c,v 1.86 2001/12/19 07:18:56 deraadt Exp $");
39 39
40#include "xmalloc.h" 40#include "xmalloc.h"
41#include "packet.h" 41#include "packet.h"
@@ -195,12 +195,12 @@ wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp, int *maxfdp,
195 int client_alive_scheduled = 0; 195 int client_alive_scheduled = 0;
196 196
197 /* 197 /*
198 * if using client_alive, set the max timeout accordingly, 198 * if using client_alive, set the max timeout accordingly,
199 * and indicate that this particular timeout was for client 199 * and indicate that this particular timeout was for client
200 * alive by setting the client_alive_scheduled flag. 200 * alive by setting the client_alive_scheduled flag.
201 * 201 *
202 * this could be randomized somewhat to make traffic 202 * this could be randomized somewhat to make traffic
203 * analysis more difficult, but we're not doing it yet. 203 * analysis more difficult, but we're not doing it yet.
204 */ 204 */
205 if (compat20 && 205 if (compat20 &&
206 max_time_milliseconds == 0 && options.client_alive_interval) { 206 max_time_milliseconds == 0 && options.client_alive_interval) {
@@ -598,7 +598,7 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
598 drain_output(); 598 drain_output();
599 599
600 debug("End of interactive session; stdin %ld, stdout (read %ld, sent %ld), stderr %ld bytes.", 600 debug("End of interactive session; stdin %ld, stdout (read %ld, sent %ld), stderr %ld bytes.",
601 stdin_bytes, fdout_bytes, stdout_bytes, stderr_bytes); 601 stdin_bytes, fdout_bytes, stdout_bytes, stderr_bytes);
602 602
603 /* Free and clear the buffers. */ 603 /* Free and clear the buffers. */
604 buffer_free(&stdin_buffer); 604 buffer_free(&stdin_buffer);
@@ -738,12 +738,12 @@ static void
738server_input_channel_failure(int type, int plen, void *ctxt) 738server_input_channel_failure(int type, int plen, void *ctxt)
739{ 739{
740 debug("Got CHANNEL_FAILURE for keepalive"); 740 debug("Got CHANNEL_FAILURE for keepalive");
741 /* 741 /*
742 * reset timeout, since we got a sane answer from the client. 742 * reset timeout, since we got a sane answer from the client.
743 * even if this was generated by something other than 743 * even if this was generated by something other than
744 * the bogus CHANNEL_REQUEST we send for keepalives. 744 * the bogus CHANNEL_REQUEST we send for keepalives.
745 */ 745 */
746 client_alive_timeouts = 0; 746 client_alive_timeouts = 0;
747} 747}
748 748
749 749