1 files changed, 6 insertions, 22 deletions

diff --git a/clientloop.c b/clientloop.c
index 1bdac6a46..42ace7789 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.340 2020/02/02 09:45:34 dtucker Exp $ */
+/* $OpenBSD: clientloop.c,v 1.344 2020/04/24 02:19:40 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -153,9 +153,6 @@ extern char *forward_agent_sock_path;
 static volatile sig_atomic_t received_window_change_signal = 0;
 static volatile sig_atomic_t received_signal = 0;
 
-/* Flag indicating whether the user's terminal is in non-blocking mode. */
-static int in_non_blocking_mode = 0;
-
 /* Time when backgrounded control master using ControlPersist should exit */
 static time_t control_persist_exit_time = 0;
 
@@ -200,17 +197,6 @@ static struct global_confirms global_confirms =
 
 void ssh_process_session2_setup(int, int, int, struct sshbuf *);
 
-/* Restores stdin to blocking mode. */
-
-static void
-leave_non_blocking(void)
-{
-        if (in_non_blocking_mode) {
-                unset_nonblock(fileno(stdin));
-                in_non_blocking_mode = 0;
-        }
-}
-
 /*
  * Signal handler for the window change signal (SIGWINCH).  This just sets a
  * flag indicating that the window has changed.
@@ -461,11 +447,8 @@ client_check_window_change(struct ssh *ssh)
 {
         if (!received_window_change_signal)
                 return;
-        /** XXX race */
         received_window_change_signal = 0;
-
         debug2("%s: changed", __func__);
-
         channel_send_window_changes(ssh);
 }
 
@@ -480,8 +463,7 @@ client_global_request_reply(int type, u_int32_t seq, struct ssh *ssh)
                 gc->cb(ssh, type, seq, gc->ctx);
         if (--gc->ref_count <= 0) {
                 TAILQ_REMOVE(&global_confirms, gc, entry);
-                explicit_bzero(gc, sizeof(*gc));
-                free(gc);
+                freezero(gc, sizeof(*gc));
         }
 
         ssh_packet_set_alive_timeouts(ssh, 0);
@@ -1662,7 +1644,7 @@ client_request_agent(struct ssh *ssh, const char *request_type, int rchan)
 
 char *
 client_request_tun_fwd(struct ssh *ssh, int tun_mode,
-    int local_tun, int remote_tun)
+    int local_tun, int remote_tun, channel_open_fn *cb, void *cbctx)
 {
         Channel *c;
         int r, fd;
@@ -1690,6 +1672,9 @@ client_request_tun_fwd(struct ssh *ssh, int tun_mode,
                     sys_tun_outfilter, NULL, NULL);
 #endif
 
+        if (cb != NULL)
+                channel_register_open_confirm(ssh, c->self, cb, cbctx);
+
         if ((r = sshpkt_start(ssh, SSH2_MSG_CHANNEL_OPEN)) != 0 ||
             (r = sshpkt_put_cstring(ssh, "tun@openssh.com")) != 0 ||
             (r = sshpkt_put_u32(ssh, c->self)) != 0 ||
@@ -2472,7 +2457,6 @@ void
 cleanup_exit(int i)
 {
         leave_raw_mode(options.request_tty == REQUEST_TTY_FORCE);
-        leave_non_blocking();
         if (options.control_path != NULL && muxserver_sock != -1)
                 unlink(options.control_path);
         ssh_kill_proxy_command();