- (tim) [regress/README.regress] Document ssh-rand-helper issue. ok bal

[openssh.git] / clientloop.c

diff --git a/clientloop.c b/clientloop.c
index e7a7d9fa71754b9fbca8f1a811358bb7a2d20865..626b29a5a24fd1a4af6a2b736aa2f907a5084cae 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.115 2003/09/23 20:41:11 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.117 2003/12/16 15:49:51 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -89,6 +89,9 @@ extern Options options;
 /* Flag indicating that stdin should be redirected from /dev/null. */
 extern int stdin_null_flag;
 
+/* Flag indicating that no shell has been requested */
+extern int no_shell_flag;
+
 /*
  * Name of the host we are connecting to.  This is the name given on the
  * command line, or the HostName specified for the user-supplied name in a
@@ -124,6 +127,7 @@ static int connection_in;   /* Connection to server (input). */
 static int connection_out;     /* Connection to server (output). */
 static int need_rekeying;      /* Set to non-zero if rekeying is requested. */
 static int session_closed = 0; /* In SSH2: login session closed. */
+static int server_alive_timeouts = 0;
 
 static void client_init_dispatch(void);
 int    session_ident = -1;
@@ -310,6 +314,24 @@ client_check_window_change(void)
        }
 }
 
+static void
+client_global_request_reply(int type, u_int32_t seq, void *ctxt)
+{
+       server_alive_timeouts = 0;
+       client_global_request_reply_fwd(type, seq, ctxt);
+}
+
+static void
+server_alive_check(void)
+{
+       if (++server_alive_timeouts > options.server_alive_count_max)
+               packet_disconnect("Timeout, server not responding.");
+       packet_start(SSH2_MSG_GLOBAL_REQUEST);
+       packet_put_cstring("keepalive@openssh.com");
+       packet_put_char(1);     /* boolean: want reply */
+       packet_send();
+}
+
 /*
  * Waits until the client can do something (some data becomes available on
  * one of the file descriptors).
@@ -319,6 +341,9 @@ static void
 client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
     int *maxfdp, int *nallocp, int rekeying)
 {
+       struct timeval tv, *tvp;
+       int ret;
+
        /* Add any selections by the channel mechanism. */
        channel_prepare_select(readsetp, writesetp, maxfdp, nallocp, rekeying);
 
@@ -360,13 +385,18 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
        /*
         * Wait for something to happen.  This will suspend the process until
         * some selected descriptor can be read, written, or has some other
-        * event pending. Note: if you want to implement SSH_MSG_IGNORE
-        * messages to fool traffic analysis, this might be the place to do
-        * it: just have a random timeout for the select, and send a random
-        * SSH_MSG_IGNORE packet when the timeout expires.
+        * event pending.
         */
 
-       if (select((*maxfdp)+1, *readsetp, *writesetp, NULL, NULL) < 0) {
+       if (options.server_alive_interval == 0 || !compat20)
+               tvp = NULL;
+       else {  
+               tv.tv_sec = options.server_alive_interval;
+               tv.tv_usec = 0;
+               tvp = &tv;
+       }
+       ret = select((*maxfdp)+1, *readsetp, *writesetp, NULL, tvp);
+       if (ret < 0) {
                char buf[100];
 
                /*
@@ -383,7 +413,8 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
                snprintf(buf, sizeof buf, "select: %s\r\n", strerror(errno));
                buffer_append(&stderr_buffer, buf, strlen(buf));
                quit_pending = 1;
-       }
+       } else if (ret == 0)
+               server_alive_check();
 }
 
 static void
@@ -1031,6 +1062,16 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
        if (!isatty(fileno(stderr)))
                unset_nonblock(fileno(stderr));
 
+       /*
+        * If there was no shell or command requested, there will be no remote
+        * exit status to be returned.  In that case, clear error code if the
+        * connection was deliberately terminated at this end.
+        */
+       if (no_shell_flag && received_signal == SIGTERM) {
+               received_signal = 0;
+               exit_status = 0;
+       }
+
        if (received_signal)
                fatal("Killed by signal %d.", (int) received_signal);
 
@@ -1352,7 +1393,8 @@ client_input_global_request(int type, u_int32_t seq, void *ctxt)
 
        rtype = packet_get_string(NULL);
        want_reply = packet_get_char();
-       debug("client_input_global_request: rtype %s want_reply %d", rtype, want_reply);
+       debug("client_input_global_request: rtype %s want_reply %d",
+           rtype, want_reply);
        if (want_reply) {
                packet_start(success ?
                    SSH2_MSG_REQUEST_SUCCESS : SSH2_MSG_REQUEST_FAILURE);