- (bal) Missed two files in major resync. auth-bsdauth.c and auth-skey.c

[openssh.git] / clientloop.c

diff --git a/clientloop.c b/clientloop.c
index b2b7debc8f4c03ddfbd2c6e7b9645f9656681df9..3a1b43dda3d898bf8447e3a9d2aff43d4556cb6e 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.69 2001/05/08 19:17:31 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.75 2001/06/04 23:07:20 markus Exp $");
 
 #include "ssh.h"
 #include "ssh1.h"
@@ -102,6 +102,7 @@ extern char *host;
  * because this is updated in a signal handler.
  */
 static volatile int received_window_change_signal = 0;
+static volatile int received_signal = 0;
 
 /* Flag indicating whether the user\'s terminal is in non-blocking mode. */
 static int in_non_blocking_mode = 0;
@@ -171,13 +172,8 @@ window_change_handler(int sig)
 void
 signal_handler(int sig)
 {
-       if (in_raw_mode())
-               leave_raw_mode();
-       if (in_non_blocking_mode)
-               leave_non_blocking();
-       channel_stop_listening();
-       packet_close();
-       fatal("Killed by signal %d.", sig);
+       received_signal = sig;
+       quit_pending = 1;
 }
 
 /*
@@ -346,7 +342,13 @@ client_wait_until_can_do_something(fd_set **readsetp, fd_set **writesetp,
                if (buffer_len(&stderr_buffer) > 0)
                        FD_SET(fileno(stderr), *writesetp);
        } else {
-               FD_SET(connection_in, *readsetp);
+               /* channel_prepare_select could have closed the last channel */
+               if (session_closed && !channel_still_open()) {
+                       if (!packet_have_data_to_write())
+                               return;
+               } else {
+                       FD_SET(connection_in, *readsetp);
+               }
        }
 
        /* Select server connection if have data to write to the server. */
@@ -566,7 +568,7 @@ process_escapes(Buffer *bin, Buffer *bout, Buffer *berr, char *buf, int len)
 "%c?\r\n\
 Supported escape sequences:\r\n\
 ~.  - terminate connection\r\n\
-~R - Request rekey (SSH protocol 2 only)\r\n\
+~R  - Request rekey (SSH protocol 2 only)\r\n\
 ~^Z - suspend ssh\r\n\
 ~#  - list forwarded connections\r\n\
 ~&  - background ssh (when waiting for connections to terminate)\r\n\
@@ -651,7 +653,7 @@ client_process_input(fd_set * readset)
                                packet_start(SSH_CMSG_EOF);
                                packet_send();
                        }
-               } else if (escape_char == -1) {
+               } else if (escape_char == SSH_ESCAPECHAR_NONE) {
                        /*
                         * Normal successful read, and no escape character.
                         * Just append the data to buffer.
@@ -759,8 +761,8 @@ client_channel_closed(int id, void *arg)
 /*
  * Implements the interactive session with the server.  This is called after
  * the user has been authenticated, and a command has been started on the
- * remote host.  If escape_char != -1, it is the character used as an escape
- * character for terminating or suspending the session.
+ * remote host.  If escape_char != SSH_ESCAPECHAR_NONE, it is the character
+ * used as an escape character for terminating or suspending the session.
  */
 
 int
@@ -823,7 +825,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
 
        if (compat20) {
                session_ident = ssh2_chan_id;
-               if (escape_char != -1)
+               if (escape_char != SSH_ESCAPECHAR_NONE)
                        channel_register_filter(session_ident,
                            simple_escape_filter);
                if (session_ident != -1)
@@ -927,6 +929,23 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
        /* Stop listening for connections. */
        channel_stop_listening();
 
+       if (have_pty)
+               leave_raw_mode();
+
+       /* restore blocking io */
+       if (!isatty(fileno(stdin)))
+               unset_nonblock(fileno(stdin));
+       if (!isatty(fileno(stdout)))
+               unset_nonblock(fileno(stdout));
+       if (!isatty(fileno(stderr)))
+               unset_nonblock(fileno(stderr));
+
+       if (received_signal) {
+               if (in_non_blocking_mode)       /* XXX */
+                       leave_non_blocking();
+               fatal("Killed by signal %d.", received_signal);
+       }
+
        /*
         * In interactive mode (with pseudo tty) display a message indicating
         * that the connection has been closed.
@@ -935,29 +954,31 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
                snprintf(buf, sizeof buf, "Connection to %.64s closed.\r\n", host);
                buffer_append(&stderr_buffer, buf, strlen(buf));
        }
+
        /* Output any buffered data for stdout. */
-       if (buffer_len(&stdout_buffer) > 0) {
-               len = atomicio(write, fileno(stdout), buffer_ptr(&stdout_buffer),
+       while (buffer_len(&stdout_buffer) > 0) {
+               len = write(fileno(stdout), buffer_ptr(&stdout_buffer),
                    buffer_len(&stdout_buffer));
-               if (len != buffer_len(&stdout_buffer))
+               if (len <= 0) {
                        error("Write failed flushing stdout buffer.");
+                       break;
+               }
                buffer_consume(&stdout_buffer, len);
                stdout_bytes += len;
        }
 
        /* Output any buffered data for stderr. */
-       if (buffer_len(&stderr_buffer) > 0) {
-               len = atomicio(write, fileno(stderr), buffer_ptr(&stderr_buffer),
+       while (buffer_len(&stderr_buffer) > 0) {
+               len = write(fileno(stderr), buffer_ptr(&stderr_buffer),
                    buffer_len(&stderr_buffer));
-               if (len != buffer_len(&stderr_buffer))
+               if (len <= 0) {
                        error("Write failed flushing stderr buffer.");
+                       break;
+               }
                buffer_consume(&stderr_buffer, len);
                stderr_bytes += len;
        }
 
-       if (have_pty)
-               leave_raw_mode();
-
        /* Clear and free any buffers. */
        memset(buf, 0, sizeof(buf));
        buffer_free(&stdin_buffer);