simon-git: putty (master): Ben Harris

[Commits to Tartarus CVS repository.]

TL;DR:
  5347f9e Put handling of incoming data on agent channels into its own function.
  6da1a32 Simplifiy handling of stdin data in SSH-2.
  93988f3 Call ssh2_try_send() from ssh2_add_channel_data() and rename latter
  adc8ae2 Shared ssh_send_channel_data for both SSH-1 and SSH-2.

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-04-23 16:14:21

commit 5347f9e69c8a18588966540f5cb4bcce4e5fe777
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=5347f9e69c8a18588966540f5cb4bcce4e5fe777;hp=b22c0b6f3e6f5254270a89f86df3edfc4da829d2
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Fri Apr 22 23:00:46 2016 +0100

    Put handling of incoming data on agent channels into its own function.
    
    This function can be shared between SSH-1 and SSH-2, and makes the
    per-protocol data-handling functions more generic.

 ssh.c |  127 +++++++++++++++++++++++------------------------------------------
 1 file changed, 44 insertions(+), 83 deletions(-)

commit 6da1a325cc4d66a47545b638e46275eb93ac1323
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=6da1a325cc4d66a47545b638e46275eb93ac1323;hp=5347f9e69c8a18588966540f5cb4bcce4e5fe777
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Sat Apr 23 13:10:11 2016 +0100

    Simplifiy handling of stdin data in SSH-2.
    
    Specifically, don't try to unblock all channels just because we've got
    something to send on the main one.  It looks like the code to do that
    was left over from when SSH_MSG_CHANNEL_ADJUST was handled in
    do_ssh2_authconn().

 ssh.c |   14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

commit 93988f3ada4e8a30f24800fdab96530aaaab5714
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=93988f3ada4e8a30f24800fdab96530aaaab5714;hp=6da1a325cc4d66a47545b638e46275eb93ac1323
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Sat Apr 23 13:17:33 2016 +0100

    Call ssh2_try_send() from ssh2_add_channel_data() and rename latter
    
    All calls to ssh2_add_channel_data() were followed by a call to
    ssh2_try_send(), so it seems sensible to replace ssh2_add_channel_data()
    with ssh2_send_channel_data(), which does both.

 ssh.c |   20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

commit adc8ae214edf3d75d2fde11bfa59531898f58aed
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=adc8ae214edf3d75d2fde11bfa59531898f58aed;hp=93988f3ada4e8a30f24800fdab96530aaaab5714
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Sat Apr 23 15:51:45 2016 +0100

    Shared ssh_send_channel_data for both SSH-1 and SSH-2.
    
    Saves duplication between agent and port forwarding code.
    
    Conflicts:
    	ssh.c

 ssh.c |   59 ++++++++++++++++++++++++++---------------------------------
 1 file changed, 26 insertions(+), 33 deletions(-)