summaryrefslogtreecommitdiff
path: root/clientloop.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2016-01-29 23:04:46 +0000
committerDamien Miller <djm@mindrot.org>2016-01-30 11:19:16 +1100
commit4c6cb8330460f94e6c7ae28a364236d4188156a3 (patch)
tree7e4dd6aa9c4c3f213016d61c0c9e3f47685100be /clientloop.c
parent28136471809806d6246ef41e4341467a39fe2f91 (diff)
upstream commit
Remove leftover roaming dead code. ok djm markus. Upstream-ID: 13d1f9c8b65a5109756bcfd3b74df949d53615be
Diffstat (limited to 'clientloop.c')
-rw-r--r--clientloop.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/clientloop.c b/clientloop.c
index 0c77b046c..f8f9a3f2a 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.281 2016/01/23 05:31:35 jsg Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.282 2016/01/29 23:04:46 dtucker Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -168,8 +168,6 @@ static u_int x11_refuse_time; /* If >0, refuse x11 opens after this time. */
168static void client_init_dispatch(void); 168static void client_init_dispatch(void);
169int session_ident = -1; 169int session_ident = -1;
170 170
171int session_resumed = 0;
172
173/* Track escape per proto2 channel */ 171/* Track escape per proto2 channel */
174struct escape_filter_ctx { 172struct escape_filter_ctx {
175 int escape_pending; 173 int escape_pending;
@@ -1686,14 +1684,6 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
1686 client_process_output(writeset); 1684 client_process_output(writeset);
1687 } 1685 }
1688 1686
1689 if (session_resumed) {
1690 connection_in = packet_get_connection_in();
1691 connection_out = packet_get_connection_out();
1692 max_fd = MAX(max_fd, connection_out);
1693 max_fd = MAX(max_fd, connection_in);
1694 session_resumed = 0;
1695 }
1696
1697 /* 1687 /*
1698 * Send as much buffered packet data as possible to the 1688 * Send as much buffered packet data as possible to the
1699 * sender. 1689 * sender.