1 files changed, 19 insertions, 8 deletions

diff --git a/clientloop.c b/clientloop.c
index 52667017c..141e0fff5 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.209 2009/02/12 03:00:56 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.213 2009/07/05 19:28:33 stevesk 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"
 
 #ifdef GSSAPI
 #include "ssh-gss.h"
@@ -495,13 +496,13 @@ client_global_request_reply(int type, u_int32_t seq, void *ctxt)
                 xfree(gc);
         }
 
-        keep_alive_timeouts = 0;
+        packet_set_alive_timeouts(0);
 }
 
 static void
 server_alive_check(void)
 {
-        if (++keep_alive_timeouts > options.server_alive_count_max) {
+        if (packet_inc_alive_timeouts() > options.server_alive_count_max) {
                 logit("Timeout, server not responding.");
                 cleanup_exit(255);
         }
@@ -638,8 +639,8 @@ client_suspend_self(Buffer *bin, Buffer *bout, Buffer *berr)
 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
@@ -647,8 +648,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.
@@ -1132,7 +1133,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)) {
@@ -1434,11 +1435,13 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
                 if (!rekeying) {
                         channel_after_select(readset, writeset);
 
+#ifdef GSSAPI
                         if (options.gss_renewal_rekey &&
                             ssh_gssapi_credentials_updated(GSS_C_NO_CONTEXT)) {
                                 debug("credentials updated - forcing rekey");
                                 need_rekeying = 1;
                         }
+#endif
 
                         if (need_rekeying || packet_need_rekeying()) {
                                 debug("need rekeying");
@@ -1487,6 +1490,14 @@ 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)