Skip to content

Commit

Permalink
Use proper CHAN_TCP_PACKET_DEFAULT for agent forwarding when HPN disa…
Browse files Browse the repository at this point in the history
…bled.

The use of CHAN_TCP_WINDOW_DEFAULT here was fixed in upstream OpenSSH
in CVS 1.4810, git 5baa170d771de9e95cf30b4c469ece684244cf3e:

  - [email protected] 2007/12/28 22:34:47
    [clientloop.c]
    Use the correct packet maximum sizes for remote port and agent forwarding.
    Prevents the server from killing the connection if too much data is queued
    and an excessively large packet gets sent.  bz freebsd#1360, ok djm@.

The change was lost due to the the way the original upstream HPN patch
modified this code. It was re-adding the original OpenSSH code and never
was properly fixed to use the new value.

MFC after:	2 weeks
  • Loading branch information
bdrewery committed Apr 2, 2015
1 parent 97599fc commit a636f8f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion crypto/openssh/clientloop.c
Original file line number Diff line number Diff line change
Expand Up @@ -1923,7 +1923,7 @@ client_request_agent(const char *request_type, int rchan)
if (options.hpn_disabled)
c = channel_new("authentication agent connection",
SSH_CHANNEL_OPEN, sock, sock, -1,
CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_WINDOW_DEFAULT, 0,
CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0,
"authentication agent connection", 1);
else
c = channel_new("authentication agent connection",
Expand Down

0 comments on commit a636f8f

Please sign in to comment.