- (tim) [defines.h] openbsd-compat/readpassphrase.c now needs _NSIG.

[openssh.git] / clientloop.c

diff --git a/clientloop.c b/clientloop.c
index 2cb8c3a492043a5e5b6789c7e2caf5a7843e7494..5793a6e91e2fca9d9a7dc10b84a68f6ab17b5313 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.210 2009/05/25 06:48:01 andreas Exp $ */
+/* $OpenBSD: clientloop.c,v 1.216 2010/01/09 05:04:24 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -109,6 +109,7 @@
 #include "misc.h"
 #include "match.h"
 #include "msg.h"
+#include "roaming.h"
 
 /* import options */
 extern Options options;
@@ -129,6 +130,9 @@ extern int muxserver_sock;
  */
 extern char *host;
 
+/* Force TTY allocation */
+extern int force_tty_flag;
+
 /*
  * Flag to indicate that we have received a window change signal which has
  * not yet been processed.  This will cause a message indicating the new
@@ -160,6 +164,8 @@ static int session_closed = 0;      /* In SSH2: login session closed. */
 static void client_init_dispatch(void);
 int    session_ident = -1;
 
+int    session_resumed = 0;
+
 /* Track escape per proto2 channel */
 struct escape_filter_ctx {
        int escape_pending;
@@ -607,7 +613,7 @@ client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr)
                atomicio(vwrite, fileno(stderr), buffer_ptr(berr),
                    buffer_len(berr));
 
-       leave_raw_mode();
+       leave_raw_mode(force_tty_flag);
 
        /*
         * Free (and clear) the buffer to reduce the amount of data that gets
@@ -628,14 +634,14 @@ client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr)
        buffer_init(bout);
        buffer_init(berr);
 
-       enter_raw_mode();
+       enter_raw_mode(force_tty_flag);
 }
 
 static void
 client_process_net_input(fd_set *readset)
 {
-       int len;
-       char buf[8192];
+       int len, cont = 0;
+       char buf[SSH_IOBUFSZ];
 
        /*
         * Read input from the server, and add any such data to the buffer of
@@ -643,8 +649,8 @@ client_process_net_input(fd_set *readset)
         */
        if (FD_ISSET(connection_in, readset)) {
                /* Read as much as possible. */
-               len = read(connection_in, buf, sizeof(buf));
-               if (len == 0) {
+               len = roaming_read(connection_in, buf, sizeof(buf), &cont);
+               if (len == 0 && cont == 0) {
                        /*
                         * Received EOF.  The remote host has closed the
                         * connection.
@@ -771,7 +777,7 @@ process_cmdline(void)
        bzero(&fwd, sizeof(fwd));
        fwd.listen_host = fwd.connect_host = NULL;
 
-       leave_raw_mode();
+       leave_raw_mode(force_tty_flag);
        handler = signal(SIGINT, SIG_IGN);
        cmd = s = read_passphrase("\r\nssh> ", RP_ECHO);
        if (s == NULL)
@@ -874,7 +880,7 @@ process_cmdline(void)
 
 out:
        signal(SIGINT, handler);
-       enter_raw_mode();
+       enter_raw_mode(force_tty_flag);
        if (cmd)
                xfree(cmd);
        if (fwd.listen_host != NULL)
@@ -993,7 +999,7 @@ process_escapes(Channel *c, Buffer *bin, Buffer *bout, Buffer *berr,
                                 * more new connections).
                                 */
                                /* Restore tty modes. */
-                               leave_raw_mode();
+                               leave_raw_mode(force_tty_flag);
 
                                /* Stop listening for new connections. */
                                channel_stop_listening();
@@ -1128,7 +1134,7 @@ static void
 client_process_input(fd_set *readset)
 {
        int len;
-       char buf[8192];
+       char buf[SSH_IOBUFSZ];
 
        /* Read input from stdin. */
        if (FD_ISSET(fileno(stdin), readset)) {
@@ -1288,7 +1294,7 @@ client_channel_closed(int id, void *arg)
 {
        channel_cancel_cleanup(id);
        session_closed = 1;
-       leave_raw_mode();
+       leave_raw_mode(force_tty_flag);
 }
 
 /*
@@ -1361,7 +1367,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
        signal(SIGWINCH, window_change_handler);
 
        if (have_pty)
-               enter_raw_mode();
+               enter_raw_mode(force_tty_flag);
 
        if (compat20) {
                session_ident = ssh2_chan_id;
@@ -1459,6 +1465,14 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
                        client_process_output(writeset);
                }
 
+               if (session_resumed) {
+                       connection_in = packet_get_connection_in();
+                       connection_out = packet_get_connection_out();
+                       max_fd = MAX(max_fd, connection_out);
+                       max_fd = MAX(max_fd, connection_in);
+                       session_resumed = 0;
+               }
+
                /*
                 * Send as much buffered packet data as possible to the
                 * sender.
@@ -1476,10 +1490,18 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
        /* Stop watching for window change. */
        signal(SIGWINCH, SIG_DFL);
 
+       if (compat20) {
+               packet_start(SSH2_MSG_DISCONNECT);
+               packet_put_int(SSH2_DISCONNECT_BY_APPLICATION);
+               packet_put_cstring("disconnected by user");
+               packet_send();
+               packet_write_wait();
+       }
+
        channel_free_all();
 
        if (have_pty)
-               leave_raw_mode();
+               leave_raw_mode(force_tty_flag);
 
        /* restore blocking io */
        if (!isatty(fileno(stdin)))
@@ -1837,15 +1859,17 @@ client_input_channel_req(int type, u_int32_t seq, void *ctxt)
                chan_rcvd_eow(c);
        } else if (strcmp(rtype, "exit-status") == 0) {
                exitval = packet_get_int();
-               if (id == session_ident) {
+               if (c->ctl_fd != -1) {
+                       /* Dispatch to mux client */
+                       atomicio(vwrite, c->ctl_fd, &exitval, sizeof(exitval));
+                       success = 1;
+               } else if (id == session_ident) {
+                       /* Record exit value of local session */
                        success = 1;
                        exit_status = exitval;
-               } else if (c->ctl_fd == -1) {
+               } else {
                        error("client_input_channel_req: unexpected channel %d",
                            session_ident);
-               } else {
-                       atomicio(vwrite, c->ctl_fd, &exitval, sizeof(exitval));
-                       success = 1;
                }
                packet_check_eom();
        }
@@ -2041,7 +2065,7 @@ client_init_dispatch(void)
 void
 cleanup_exit(int i)
 {
-       leave_raw_mode();
+       leave_raw_mode(force_tty_flag);
        leave_non_blocking();
        if (options.control_path != NULL && muxserver_sock != -1)
                unlink(options.control_path);