summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/buffer.c
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2011-08-03 19:14:22 +0000
committerbrooks <brooks@FreeBSD.org>2011-08-03 19:14:22 +0000
commit0f65fdcb29dbe4f29dde3b5ae94b071ac26bd281 (patch)
tree8b4a106674838af0ac7eedd28b1ef001d98c7afa /crypto/openssh/buffer.c
parentde1f0b5343c3a7812121eff0346472c63e25046a (diff)
downloadFreeBSD-src-0f65fdcb29dbe4f29dde3b5ae94b071ac26bd281.zip
FreeBSD-src-0f65fdcb29dbe4f29dde3b5ae94b071ac26bd281.tar.gz
Add support for dynamically adjusted buffers to allow the full use of
the bandwidth of long fat pipes (i.e. 100Mbps+ trans-oceanic or trans-continental links). Bandwidth-delay products up to 64MB are supported. Also add support (not compiled by default) for the None cypher. The None cypher can only be enabled on non-interactive sessions (those without a pty where -T was not used) and must be enabled in both the client and server configuration files and on the client command line. Additionally, the None cypher will only be activated after authentication is complete. To enable the None cypher you must add -DNONE_CIPHER_ENABLED to CFLAGS via the make command line or in /etc/make.conf. This code is a style(9) compliant version of these features extracted from the patches published at: http://www.psc.edu/networking/projects/hpn-ssh/ Merging this patch has been a collaboration between me and Bjoern. Reviewed by: bz Approved by: re (kib), des (maintainer)
Diffstat (limited to 'crypto/openssh/buffer.c')
-rw-r--r--crypto/openssh/buffer.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/crypto/openssh/buffer.c b/crypto/openssh/buffer.c
index ae97003..a3202c6 100644
--- a/crypto/openssh/buffer.c
+++ b/crypto/openssh/buffer.c
@@ -1,4 +1,5 @@
/* $OpenBSD: buffer.c,v 1.32 2010/02/09 03:56:28 djm Exp $ */
+/* $FreeBSD$ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -25,7 +26,7 @@
#include "log.h"
#define BUFFER_MAX_CHUNK 0x100000
-#define BUFFER_MAX_LEN 0xa00000
+#define BUFFER_MAX_LEN 0x4000000 /* 64MB */
#define BUFFER_ALLOCSZ 0x008000
/* Initializes the buffer structure. */
@@ -165,6 +166,13 @@ buffer_len(const Buffer *buffer)
return buffer->end - buffer->offset;
}
+/* Returns the maximum number of bytes of data that may be in the buffer. */
+u_int
+buffer_get_max_len(void)
+{
+ return (BUFFER_MAX_LEN);
+}
+
/* Gets data from the beginning of the buffer. */
int
OpenPOWER on IntegriCloud