simon-git: putty (master): Simon Tatham

[Commits to Tartarus hosted VCS]

TL;DR:
  361efee6 Reinstate setting of ssh->session_started.
  e2307518 Remove FLAG_STDERR completely.
  a19faa45 Minor header-file cleanups.

Repository:     https://git.tartarus.org/simon/putty.git
On the web:     https://git.tartarus.org/?p=simon/putty.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2018-09-21 17:08:57

commit 361efee621af9eb1f4899cc6757cba0b715aab73
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=361efee621af9eb1f4899cc6757cba0b715aab73;hp=e1b52ae721ef5b41fb80d88b3e645bee47deadd5
Author: Simon Tatham <anakin at pobox.com>
Date:   Fri Sep 21 16:26:57 2018 +0100

    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(+)

commit e230751853ce8f6d87a0b935a36e5429eb36e1e2
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=e230751853ce8f6d87a0b935a36e5429eb36e1e2;hp=361efee621af9eb1f4899cc6757cba0b715aab73
Author: Simon Tatham <anakin at pobox.com>
Date:   Fri Sep 21 16:15:49 2018 +0100

    Remove FLAG_STDERR completely.
    
    Originally, it controlled whether ssh.c should send terminal messages
    (such as login and password prompts) to terminal.c or to stderr. But
    we've had the from_backend() abstraction for ages now, which even has
    an existing flag to indicate that the data is stderr rather than
    stdout data; applications which set FLAG_STDERR are precisely those
    that link against uxcons or wincons, so from_backend will do the
    expected thing anyway with data sent to it with that flag set. So
    there's no reason ssh.c can't just unconditionally pass everything
    through that, and remove the special case.
    
    FLAG_STDERR was also used by winproxy and uxproxy to decide whether to
    capture standard error from a local proxy command, or whether to let
    the proxy command send its diagnostics directly to the usual standard
    error. On reflection, I think it's better to unconditionally capture
    the proxy's stderr, for three reasons. Firstly, it means proxy
    diagnostics are prefixed with 'proxy:' so that you can tell them apart
    from any other stderr spew (which used to be particularly confusing if
    both the main application and the proxy command were instances of
    Plink); secondly, proxy diagnostics are now reliably copied to packet
    log files along with all the other Event Log entries, even by
    command-line tools; and thirdly, this means the option to suppress
    proxy command diagnostics after the main session starts will actually
    _work_ in the command-line tools, which it previously couldn't.
    
    A more minor structure change is that copying of Event Log messages to
    stderr in verbose mode is now done by wincons/uxcons, instead of
    centrally in logging.c (since logging.c can now no longer check
    FLAG_STDERR to decide whether to do it). The total amount of code to
    do this is considerably smaller than the defensive-sounding comment in
    logevent.c explaining why I did it the other way instead :-)

 logging.c          | 13 ++-----------
 pscp.c             |  2 +-
 psftp.c            |  2 +-
 putty.h            |  7 +------
 ssh.c              | 17 ++---------------
 unix/uxcons.c      |  8 +++++---
 unix/uxplink.c     |  2 +-
 unix/uxproxy.c     | 25 ++++---------------------
 windows/wincons.c  |  4 ++++
 windows/winplink.c |  2 +-
 windows/winproxy.c | 26 +++++++++-----------------
 11 files changed, 31 insertions(+), 77 deletions(-)

commit a19faa452726e1c2c9897834a9139e2a0a0bca04
web diff https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=a19faa452726e1c2c9897834a9139e2a0a0bca04;hp=e230751853ce8f6d87a0b935a36e5429eb36e1e2
Author: Simon Tatham <anakin at pobox.com>
Date:   Fri Sep 21 16:53:45 2018 +0100

    Minor header-file cleanups.
    
    Moved the typedef of BinaryPacketProtocol into defs.h on the general
    principle that it's just the kind of thing that ought to go there;
    also removed the declaration of pq_base_init from ssh.h on the grounds
    that there's never been any such function! (At least, not in public
    source control - it existed in an early draft of commit 6e24b7d58.)

 defs.h | 2 ++
 ssh.h  | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)