[openssh-commits] CVS: fuyu.mindrot.org: openssh

[Damien Miller]

CVSROOT:        /var/cvs
Module name:    openssh
Changes by:     djm at fuyu.mindrot.org 10/08/05 23:09:48

Modified files:
    .               : ChangeLog channels.c

Log message:
   - djm at cvs.openbsd.org 2010/08/05 13:08:42
     [channels.c]
     Fix a trio of bugs in the local/remote window calculation for datagram
     data channels (i.e. TunnelForward):
     
     Calculate local_consumed correctly in channel_handle_wfd() by measuring
     the delta to buffer_len(c->output) from when we start to when we finish.
     The proximal problem here is that the output_filter we use in portable
     modified the length of the dequeued datagram (to futz with the headers
     for !OpenBSD).
     
     In channel_output_poll(), don't enqueue datagrams that won't fit in the
     peer's advertised packet size (highly unlikely to ever occur) or which
     won't fit in the peer's remaining window (more likely).
     
     In channel_input_data(), account for the 4-byte string header in
     datagram packets that we accept from the peer and enqueue in c->output.
     
     report, analysis and testing 2/3 cases from wierbows AT us.ibm.com;
     "looks good" markus@

Diff commands:
cvs -nQq rdiff -u -r1.5634 -r1.5635 openssh/ChangeLog
cvs -nQq rdiff -u -r1.299 -r1.300 openssh/channels.c

ViewVC:
http://anoncvs.mindrot.org/index.cgi/openssh/ChangeLog?r1=1.5634;r2=1.5635&view=patch
http://anoncvs.mindrot.org/index.cgi/openssh/channels.c?r1=1.299;r2=1.300&view=patch

Please note that there may be a delay before commits are available
on the public ViewVC site.