- millert@cvs.openbsd.org 2001/03/04 17:42:28

[openssh.git] / serverloop.c

diff --git a/serverloop.c b/serverloop.c
index 5a567a252f1cbf748ed0bdf9377ae38c00a7f770..8b1ee99190cb82a12fa8164454f18facc62ed181 100644 (file)
--- a/serverloop.c
+++ b/serverloop.c
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  *
  * SSH2 support by Markus Friedl.
- * Copyright (c) 2000 Markus Friedl. All rights reserved.
+ * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -35,14 +35,14 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: serverloop.c,v 1.43 2001/01/29 16:55:37 markus Exp $");
+RCSID("$OpenBSD: serverloop.c,v 1.54 2001/03/04 01:46:30 djm Exp $");
 
 #include "xmalloc.h"
 #include "packet.h"
 #include "buffer.h"
 #include "log.h"
 #include "servconf.h"
-#include "pty.h"
+#include "sshpty.h"
 #include "channels.h"
 #include "compat.h"
 #include "ssh1.h"
@@ -70,6 +70,7 @@ static long fdout_bytes = 0;  /* Number of stdout bytes read from program. */
 static int stdin_eof = 0;      /* EOF message received from client. */
 static int fdout_eof = 0;      /* EOF encountered reading from fdout. */
 static int fderr_eof = 0;      /* EOF encountered readung from fderr. */
+static int fdin_is_tty = 0;    /* fdin points to a tty. */
 static int connection_in;      /* Connection to client (input). */
 static int connection_out;     /* Connection to client (output). */
 static u_int buffer_high;/* "Soft" max buffer size. */
@@ -119,7 +120,7 @@ sigchld_handler2(int sig)
  * to the client.
  */
 void
-make_packets_from_stderr_data()
+make_packets_from_stderr_data(void)
 {
        int len;
 
@@ -148,7 +149,7 @@ make_packets_from_stderr_data()
  * client.
  */
 void
-make_packets_from_stdout_data()
+make_packets_from_stdout_data(void)
 {
        int len;
 
@@ -244,7 +245,7 @@ retry_select:
                tvp = &tv;
        }
        if (tvp!=NULL)
-               debug2("tvp!=NULL kid %d mili %d", child_terminated, max_time_milliseconds);
+               debug3("tvp!=NULL kid %d mili %d", child_terminated, max_time_milliseconds);
 
        /* Wait for something to happen, or the timeout to expire. */
        ret = select((*maxfdp)+1, *readsetp, *writesetp, NULL, tvp);
@@ -317,6 +318,7 @@ process_input(fd_set * readset)
 void
 process_output(fd_set * writeset)
 {
+       struct termios tio;
        int len;
 
        /* Write buffered data to program stdin. */
@@ -336,7 +338,17 @@ process_output(fd_set * writeset)
 #endif
                        fdin = -1;
                } else {
-                       /* Successful write.  Consume the data from the buffer. */
+                       /* Successful write. */
+                       if (fdin_is_tty && tcgetattr(fdin, &tio) == 0 &&
+                           !(tio.c_lflag & ECHO) && (tio.c_lflag & ICANON)) {
+                               /*
+                                * Simulate echo to reduce the impact of
+                                * traffic analysis
+                                */
+                               packet_send_ignore(len);
+                               packet_send();
+                       }
+                       /* Consume the data from the buffer. */
                        buffer_consume(&stdin_buffer, len);
                        /* Update the count of bytes written to the program. */
                        stdin_bytes += len;
@@ -352,7 +364,7 @@ process_output(fd_set * writeset)
  * This is used when the program terminates.
  */
 void
-drain_output()
+drain_output(void)
 {
        /* Send any buffered stdout data to the client. */
        if (buffer_len(&stdout_buffer) > 0) {
@@ -377,7 +389,7 @@ drain_output()
 }
 
 void
-process_buffered_input_packets()
+process_buffered_input_packets(void)
 {
        dispatch_run(DISPATCH_NONBLOCK, NULL, NULL);
 }
@@ -422,6 +434,9 @@ server_loop(pid_t pid, int fdin_arg, int fdout_arg, int fderr_arg)
        if (fderr != -1)
                set_nonblock(fderr);
 
+       if (!(datafellows & SSH_BUG_IGNOREMSG) && isatty(fdin))
+               fdin_is_tty = 1;
+
        connection_in = packet_get_connection_in();
        connection_out = packet_get_connection_out();
 
@@ -864,12 +879,11 @@ server_input_global_request(int type, int plen, void *ctxt)
                        packet_send_debug("Server has disabled port forwarding.");
                } else {
                        /* Start listening on the port */
-                       channel_request_forwarding(
+                       success = channel_request_forwarding(
                            listen_address, listen_port,
                            /*unspec host_to_connect*/ "<unspec host>",
                            /*unspec port_to_connect*/ 0,
                            options.gateway_ports, /*remote*/ 1);
-                       success = 1;
                }
                xfree(listen_address);
        }
@@ -883,7 +897,7 @@ server_input_global_request(int type, int plen, void *ctxt)
 }
 
 void
-server_init_dispatch_20()
+server_init_dispatch_20(void)
 {
        debug("server_init_dispatch_20");
        dispatch_init(&dispatch_protocol_error);
@@ -899,7 +913,7 @@ server_init_dispatch_20()
        dispatch_set(SSH2_MSG_GLOBAL_REQUEST, &server_input_global_request);
 }
 void
-server_init_dispatch_13()
+server_init_dispatch_13(void)
 {
        debug("server_init_dispatch_13");
        dispatch_init(NULL);
@@ -914,7 +928,7 @@ server_init_dispatch_13()
        dispatch_set(SSH_MSG_PORT_OPEN, &channel_input_port_open);
 }
 void
-server_init_dispatch_15()
+server_init_dispatch_15(void)
 {
        server_init_dispatch_13();
        debug("server_init_dispatch_15");
@@ -922,7 +936,7 @@ server_init_dispatch_15()
        dispatch_set(SSH_MSG_CHANNEL_CLOSE_CONFIRMATION, &channel_input_oclose);
 }
 void
-server_init_dispatch()
+server_init_dispatch(void)
 {
        if (compat20)
                server_init_dispatch_20();