From 361efee621af9eb1f4899cc6757cba0b715aab73 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Fri, 21 Sep 2018 16:26:57 +0100 Subject: [PATCH] Reinstate setting of ssh->session_started. When PuTTY is configured to display stderr diagnostics from the proxy command but only until the main session starts, this flag is how the SSH backend indicates the point at which the session starts. It was previously set during version-string parsing, and I forgot to find a new home for it when I moved the version string parsing out into the new verstring BPP module in commit af8e526a7. Now reinstated, at the point where that BPP gets back to us and tells us what protocol version it's chosen. --- ssh.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ssh.c b/ssh.c index e3dba149..02a3ebc8 100644 --- a/ssh.c +++ b/ssh.c @@ -928,6 +928,14 @@ static void ssh_got_ssh_version(struct ssh_version_receiver *rcv, Ssh ssh = FROMFIELD(rcv, struct ssh_tag, version_receiver); BinaryPacketProtocol *old_bpp; + /* + * This is as good a time as any to stop printing proxy-command + * diagnostics in the terminal window, on the assumption that the + * proxy command must by now have made a sensible connection and + * the real session output will start shortly. + */ + ssh->session_started = TRUE; + /* * Queue an outgoing-data run: if the version string has been sent * late rather than early, it'll still be sitting on our output