simon-git: putty (master): Ben Harris

[Commits to Tartarus CVS repository.]

TL;DR:
  4115ab6 Don't completely ignore unknown types of SSH_MSG_CHANNEL_EXTENDED_DATA.
  12cebbf Assume that u.pfd.pf and u.x11.xconn are not NULL on appropriate channels.
  b7cc086 Move call to ssh2_channnel_check_close().
  5da8ec5 Use ssh2_channel_got_eof() in ssh1_msg_channel_close().

Repository:     git://git.tartarus.org/simon/putty.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=putty.git
Branch updated: master
Committer:      Ben Harris <bjh21 at bjh21.me.uk>
Date:           2016-05-25 23:16:56

commit 4115ab6e2e3ddd22eda230fc7b2c27781064d38a
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=4115ab6e2e3ddd22eda230fc7b2c27781064d38a;hp=f0f191466ae44e2f3ee7118c97164b5ca73ec006
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Tue May 24 22:38:40 2016 +0100

    Don't completely ignore unknown types of SSH_MSG_CHANNEL_EXTENDED_DATA.
    
    It's important to do the usual window accounting in all cases.  We
    still ignore the data themselves, which I think is the right thing to
    do.

 ssh.c |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

commit 12cebbf6760c46c9d958cc6f7661d34c0175ffab
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=12cebbf6760c46c9d958cc6f7661d34c0175ffab;hp=4115ab6e2e3ddd22eda230fc7b2c27781064d38a
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Wed May 25 22:22:19 2016 +0100

    Assume that u.pfd.pf and u.x11.xconn are not NULL on appropriate channels.
    
    Nothing ever sets them to NULL, and the various paths by which the
    channel types can be set to CHAN_X11 or CHAN_SOCKDATA all ensure thet
    the relevant union members are non-NULL.  All the removed conditionals
    have been converted into assertions, just in case  I'm wrong.

 ssh.c |   32 ++++++++++++++------------------
 1 file changed, 14 insertions(+), 18 deletions(-)

commit b7cc086e00d1801f77a10e882d4ce71f43498ec3
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=b7cc086e00d1801f77a10e882d4ce71f43498ec3;hp=12cebbf6760c46c9d958cc6f7661d34c0175ffab
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Wed May 25 23:06:20 2016 +0100

    Move call to ssh2_channnel_check_close().
    
    From ssh2_channel_got_eof() to ssh2_msg_channel_eof().  This removes
    the only SSH-2 specicifity from the former.  ssh2_channel_got_eof()
    can also be called from ssh2_msg_channel_close(), but that calls
    ssh2_channel_check_close() already.

 ssh.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 5da8ec5ca6a439a542841b02830774144bd099f9
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=5da8ec5ca6a439a542841b02830774144bd099f9;hp=b7cc086e00d1801f77a10e882d4ce71f43498ec3
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Wed May 25 23:16:09 2016 +0100

    Use ssh2_channel_got_eof() in ssh1_msg_channel_close().
    
    Of course, that means renaming it to ssh_channel_got_eof().  It also
    involves adding the assertions from ssh1_msg_channel_close(), just in
    case.

 ssh.c |   36 ++++++++----------------------------
 1 file changed, 8 insertions(+), 28 deletions(-)