diff options
| author | des <des@FreeBSD.org> | 2016-01-19 14:38:20 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2016-01-19 14:38:20 +0000 |
| commit | 43b4a69321547147333695abb6579e202b6b7967 (patch) | |
| tree | acb631e3e03ea67e3c3f3ce06f17a5e93d213a64 /crypto/openssh/serverloop.c | |
| parent | 23cbd2460dd7d0438e97d67eb18a0bd5acf7ea9c (diff) | |
| download | FreeBSD-src-43b4a69321547147333695abb6579e202b6b7967.zip FreeBSD-src-43b4a69321547147333695abb6579e202b6b7967.tar.gz | |
As previously threatened, remove the HPN patch from OpenSSH.
Diffstat (limited to 'crypto/openssh/serverloop.c')
| -rw-r--r-- | crypto/openssh/serverloop.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/crypto/openssh/serverloop.c b/crypto/openssh/serverloop.c index addecae..c1e39b5 100644 --- a/crypto/openssh/serverloop.c +++ b/crypto/openssh/serverloop.c @@ -1016,14 +1016,8 @@ server_request_tun(void) sock = tun_open(tun, mode); if (sock < 0) goto done; - if (options.hpn_disabled) - c = channel_new("tun", SSH_CHANNEL_OPEN, sock, sock, -1, - CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, - "tun", 1); - else - c = channel_new("tun", SSH_CHANNEL_OPEN, sock, sock, -1, - options.hpn_buffer_size, CHAN_TCP_PACKET_DEFAULT, 0, - "tun", 1); + c = channel_new("tun", SSH_CHANNEL_OPEN, sock, sock, -1, + CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1); c->datagram = 1; #if defined(SSH_TUN_FILTER) if (mode == SSH_TUNMODE_POINTOPOINT) @@ -1059,8 +1053,6 @@ server_request_session(void) c = channel_new("session", SSH_CHANNEL_LARVAL, -1, -1, -1, /*window size*/0, CHAN_SES_PACKET_DEFAULT, 0, "server-session", 1); - if (!options.hpn_disabled && options.tcp_rcv_buf_poll) - c->dynamic_window = 1; if (session_open(the_authctxt, c->self) != 1) { debug("session open failed, free channel %d", c->self); channel_free(c); |
