svn commit: r280999 - head/crypto/openssh

Bryan Drewery bdrewery at FreeBSD.org
Thu Apr 2 18:43:27 UTC 2015


Author: bdrewery
Date: Thu Apr  2 18:43:25 2015
New Revision: 280999
URL: https://svnweb.freebsd.org/changeset/base/280999

Log:
  Use proper CHAN_TCP_PACKET_DEFAULT for agent forwarding when HPN disabled.
  
  The use of CHAN_TCP_WINDOW_DEFAULT here was fixed in upstream OpenSSH
  in CVS 1.4810, git 5baa170d771de9e95cf30b4c469ece684244cf3e:
  
    - dtucker at cvs.openbsd.org 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 #1360, ok djm at .
  
  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

Modified:
  head/crypto/openssh/clientloop.c

Modified: head/crypto/openssh/clientloop.c
==============================================================================
--- head/crypto/openssh/clientloop.c	Thu Apr  2 18:18:40 2015	(r280998)
+++ head/crypto/openssh/clientloop.c	Thu Apr  2 18:43:25 2015	(r280999)
@@ -1923,7 +1923,7 @@ client_request_agent(const char *request
 	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",


More information about the svn-src-head mailing list