diff options
| -rw-r--r-- | main/openssh/APKBUILD | 14 | ||||
| -rw-r--r-- | main/openssh/openssh5.9-dynwindow_noneswitch.diff | 1657 | ||||
| -rw-r--r-- | main/openssh/openssh5.9-peaktput.diff | 75 |
3 files changed, 1739 insertions, 7 deletions
diff --git a/main/openssh/APKBUILD b/main/openssh/APKBUILD index 6398fb21f..16b2714a6 100644 --- a/main/openssh/APKBUILD +++ b/main/openssh/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openssh -pkgver=5.8_p2 +pkgver=5.9_p1 _myver=${pkgver%_*}${pkgver#*_} -pkgrel=2 +pkgrel=0 pkgdesc="Port of OpenBSD's free SSH release" url="http://www.openssh.org/portable.html" arch="all" @@ -11,8 +11,8 @@ depends="openssh-client" makedepends="openssl-dev zlib-dev" subpackages="$pkgname-doc $pkgname-client" source="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/$pkgname-$_myver.tar.gz - http://www.psc.edu/networking/projects/hpn-ssh/openssh${pkgver%_*}-dynwindow_noneswitch.diff.gz - http://www.psc.edu/networking/projects/hpn-ssh/openssh${pkgver%_*}-peaktput.diff + openssh${pkgver%_*}-dynwindow_noneswitch.diff + openssh${pkgver%_*}-peaktput.diff sshd.initd sshd.confd " @@ -86,8 +86,8 @@ client() { "$subpkgdir"/etc/ssh/ } -md5sums="88a4a83b0e0e60cd545430d4e4bd7e0c openssh-5.8p2.tar.gz -4c96723cb6dd02f76fe263c4d68c6a6f openssh5.8-dynwindow_noneswitch.diff.gz -578fb646bab2d312172ec716970031b1 openssh5.8-peaktput.diff +md5sums="afe17eee7e98d3b8550cc349834a85d0 openssh-5.9p1.tar.gz +f3db05e57e7af4cb2b55b85117652ed3 openssh5.9-dynwindow_noneswitch.diff +949ff348573438163240c60d6c3618eb openssh5.9-peaktput.diff b35a2df5e951c3d315055332b6572352 sshd.initd b35e9f3829f4cfca07168fcba98749c7 sshd.confd" diff --git a/main/openssh/openssh5.9-dynwindow_noneswitch.diff b/main/openssh/openssh5.9-dynwindow_noneswitch.diff new file mode 100644 index 000000000..d08e0df07 --- /dev/null +++ b/main/openssh/openssh5.9-dynwindow_noneswitch.diff @@ -0,0 +1,1657 @@ +From: Timo Teräs <timo.teras@iki.fi> +Date: Tue, 17 Jan 2012 07:54:46 +0000 +Subject: [PATCH 2/2] dynwindow_noneswitch + +--- + HPN-README | 128 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + auth2.c | 9 ++++ + buffer.c | 2 +- + buffer.h | 3 + + channels.c | 74 ++++++++++++++++++++++++++++++--- + channels.h | 13 ++++- + cipher.c | 5 ++- + clientloop.c | 24 ++++++++++- + compat.c | 9 ++++ + compat.h | 1 + + kex.c | 34 +++++++++++++++- + kex.h | 2 + + myproposal.h | 2 + + packet.c | 42 +++++++++++++++---- + packet.h | 8 +++- + readconf.c | 73 ++++++++++++++++++++++++++++++++ + readconf.h | 6 +++ + scp.c | 4 +- + servconf.c | 66 +++++++++++++++++++++++++++++ + servconf.h | 4 ++ + serverloop.c | 39 +++++++++++++++-- + session.c | 7 +++ + sftp.1 | 3 +- + sftp.c | 2 +- + ssh.c | 78 ++++++++++++++++++++++++++++++++++- + sshconnect.c | 32 ++++++++++++++- + sshconnect2.c | 28 ++++++++++++ + sshd.c | 24 ++++++++++- + sshd_config | 14 ++++++ + version.h | 3 +- + 30 files changed, 701 insertions(+), 38 deletions(-) + create mode 100644 HPN-README + +diff --git a/HPN-README b/HPN-README +new file mode 100644 +index 0000000..72d822f +--- /dev/null ++++ b/HPN-README +@@ -0,0 +1,128 @@ ++Notes: ++ ++MULTI-THREADED CIPHER: ++The AES cipher in CTR mode has been multithreaded (MTR-AES-CTR). This will allow ssh installations ++on hosts with multiple cores to use more than one processing core during encryption. ++Tests have show significant throughput performance increases when using MTR-AES-CTR up ++to and including a full gigabit per second on quad core systems. It should be possible to ++achieve full line rate on dual core systems but OS and data management overhead makes this ++more difficult to achieve. The cipher stream from MTR-AES-CTR is entirely compatible with single ++thread AES-CTR (ST-AES-CTR) implementations and should be 100% backward compatible. Optimal ++performance requires the MTR-AES-CTR mode be enabled on both ends of the connection. ++The MTR-AES-CTR replaces ST-AES-CTR and is used in exactly the same way with the same ++nomenclature. ++Use examples: ssh -caes128-ctr you@host.com ++ scp -oCipher=aes256-ctr file you@host.com:~/file ++ ++NONE CIPHER: ++To use the NONE option you must have the NoneEnabled switch set on the server and ++you *must* have *both* NoneEnabled and NoneSwitch set to yes on the client. The NONE ++feature works with ALL ssh subsystems (as far as we can tell) *AS LONG AS* a tty is not ++spawned. If a user uses the -T switch to prevent a tty being created the NONE cipher will ++be disabled. ++ ++The performance increase will only be as good as the network and TCP stack tuning ++on the reciever side of the connection allows. As a rule of thumb a user will need ++at least 10Mb/s connection with a 100ms RTT to see a doubling of performance. The ++HPN-SSH home page describes this in greater detail. ++ ++http://www.psc.edu/networking/projects/hpn-ssh ++ ++BUFFER SIZES: ++ ++If HPN is disabled the receive buffer size will be set to the ++OpenSSH default of 64K. ++ ++If an HPN system connects to a nonHPN system the receive buffer will ++be set to the HPNBufferSize value. The default is 2MB but user adjustable. ++ ++If an HPN to HPN connection is established a number of different things might ++happen based on the user options and conditions. ++ ++Conditions: HPNBufferSize NOT Set, TCPRcvBufPoll enabled, TCPRcvBuf NOT Set ++HPN Buffer Size = up to 64MB ++This is the default state. The HPN buffer size will grow to a maximum of 64MB ++as the TCP receive buffer grows. The maximum HPN Buffer size of 64MB is ++geared towards 10GigE transcontinental connections. ++ ++Conditions: HPNBufferSize NOT Set, TCPRcvBufPoll disabled, TCPRcvBuf NOT Set ++HPN Buffer Size = TCP receive buffer value. ++Users on non-autotuning systesm should disable TCPRcvBufPoll in the ++ssh_cofig and sshd_config ++ ++Conditions: HPNBufferSize SET, TCPRcvBufPoll disabled, TCPRcvBuf NOT Set ++HPN Buffer Size = minmum of TCP receive buffer and HPNBufferSize. ++This would be the system defined TCP receive buffer (RWIN). ++ ++Conditions: HPNBufferSize SET, TCPRcvBufPoll disabled, TCPRcvBuf SET ++HPN Buffer Size = minmum of TCPRcvBuf and HPNBufferSize. ++Generally there is no need to set both. ++ ++Conditions: HPNBufferSize SET, TCPRcvBufPoll enabled, TCPRcvBuf NOT Set ++HPN Buffer Size = grows to HPNBufferSize ++The buffer will grow up to the maximum size specified here. ++ ++Conditions: HPNBufferSize SET, TCPRcvBufPoll enabled, TCPRcvBuf SET ++HPN Buffer Size = minmum of TCPRcvBuf and HPNBufferSize. ++Generally there is no need to set both of these, especially on autotuning ++systems. However, if the users wishes to override the autotuning this would be ++one way to do it. ++ ++Conditions: HPNBufferSize NOT Set, TCPRcvBufPoll enabled, TCPRcvBuf SET ++HPN Buffer Size = TCPRcvBuf. ++This will override autotuning and set the TCP recieve buffer to the user defined ++value. ++ ++ ++HPN Specific Configuration options ++ ++TcpRcvBuf=[int]KB client ++ set the TCP socket receive buffer to n Kilobytes. It can be set up to the ++maximum socket size allowed by the system. This is useful in situations where ++the tcp receive window is set low but the maximum buffer size is set ++higher (as is typical). This works on a per TCP connection basis. You can also ++use this to artifically limit the transfer rate of the connection. In these ++cases the throughput will be no more than n/RTT. The minimum buffer size is 1KB. ++Default is the current system wide tcp receive buffer size. ++ ++TcpRcvBufPoll=[yes/no] client/server ++ enable of disable the polling of the tcp receive buffer through the life ++of the connection. You would want to make sure that this option is enabled ++for systems making use of autotuning kernels (linux 2.4.24+, 2.6, MS Vista) ++default is yes. ++ ++NoneEnabled=[yes/no] client/server ++ enable or disable the use of the None cipher. Care must always be used ++when enabling this as it will allow users to send data in the clear. However, ++it is important to note that authentication information remains encrypted ++even if this option is enabled. Set to no by default. ++ ++NoneSwitch=[yes/no] client ++ Switch the encryption cipher being used to the None cipher after ++authentication takes place. NoneEnabled must be enabled on both the client ++and server side of the connection. When the connection switches to the NONE ++cipher a warning is sent to STDERR. The connection attempt will fail with an ++error if a client requests a NoneSwitch from the server that does not explicitly ++have NoneEnabled set to yes. Note: The NONE cipher cannot be used in ++interactive (shell) sessions and it will fail silently. Set to no by default. ++ ++HPNDisabled=[yes/no] client/server ++ In some situations, such as transfers on a local area network, the impact ++of the HPN code produces a net decrease in performance. In these cases it is ++helpful to disable the HPN functionality. By default HPNDisabled is set to no. ++ ++HPNBufferSize=[int]KB client/server ++ This is the default buffer size the HPN functionality uses when interacting ++with nonHPN SSH installations. Conceptually this is similar to the TcpRcvBuf ++option as applied to the internal SSH flow control. This value can range from ++1KB to 64MB (1-65536). Use of oversized or undersized buffers can cause performance ++problems depending on the length of the network path. The default size of this buffer ++is 2MB. ++ ++ ++Credits: This patch was conceived, designed, and led by Chris Rapier (rapier@psc.edu) ++ The majority of the actual coding for versions up to HPN12v1 was performed ++ by Michael Stevens (mstevens@andrew.cmu.edu). The MT-AES-CTR cipher was ++ implemented by Ben Bennet (ben@psc.edu). This work was financed, in part, ++ by Cisco System, Inc., the National Library of Medicine, ++ and the National Science Foundation. +diff --git a/auth2.c b/auth2.c +index c06c95f..699a522 100644 +--- a/auth2.c ++++ b/auth2.c +@@ -49,6 +49,7 @@ + #include "dispatch.h" + #include "pathnames.h" + #include "buffer.h" ++#include "canohost.h" + + #ifdef GSSAPI + #include "ssh-gss.h" +@@ -75,6 +76,9 @@ extern Authmethod method_gssapi; + extern Authmethod method_jpake; + #endif + ++static int log_flag = 0; ++ ++ + Authmethod *authmethods[] = { + &method_none, + &method_pubkey, +@@ -225,6 +229,11 @@ input_userauth_request(int type, u_int32_t seq, void *ctxt) + service = packet_get_cstring(NULL); + method = packet_get_cstring(NULL); + debug("userauth-request for user %s service %s method %s", user, service, method); ++ if (!log_flag) { ++ logit("SSH: Server;Ltype: Authname;Remote: %s-%d;Name: %s", ++ get_remote_ipaddr(), get_remote_port(), user); ++ log_flag = 1; ++ } + debug("attempt %d failures %d", authctxt->attempt, authctxt->failures); + + if ((style = strchr(user, ':')) != NULL) +diff --git a/buffer.c b/buffer.c +index ae97003..dc21850 100644 +--- a/buffer.c ++++ b/buffer.c +@@ -127,7 +127,7 @@ restart: + + /* Increase the size of the buffer and retry. */ + newlen = roundup(buffer->alloc + len, BUFFER_ALLOCSZ); +- if (newlen > BUFFER_MAX_LEN) ++ if (newlen > BUFFER_MAX_LEN_HPN) + fatal("buffer_append_space: alloc %u not supported", + newlen); + buffer->buf = xrealloc(buffer->buf, 1, newlen); +diff --git a/buffer.h b/buffer.h +index e2a9dd1..2c0b65c 100644 +--- a/buffer.h ++++ b/buffer.h +@@ -16,6 +16,9 @@ + #ifndef BUFFER_H + #define BUFFER_H + ++/* move the following to a more appropriate place and name */ ++#define BUFFER_MAX_LEN_HPN 0x4000000 /* 64MB */ ++ + typedef struct { + u_char *buf; /* Buffer for data. */ + u_int alloc; /* Number of bytes allocated for data. */ +diff --git a/channels.c b/channels.c +index 24d4a9f..a43235f 100644 +--- a/channels.c ++++ b/channels.c +@@ -170,8 +170,14 @@ static void port_open_helper(Channel *c, char *rtype); + static int connect_next(struct channel_connect *); + static void channel_connect_ctx_free(struct channel_connect *); + ++ ++static int hpn_disabled = 0; ++static int hpn_buffer_size = 2 * 1024 * 1024; ++ + /* -- channel core */ + ++ ++ + Channel * + channel_by_id(int id) + { +@@ -313,6 +319,7 @@ channel_new(char *ctype, int type, int rfd, int wfd, int efd, + c->local_window_max = window; + c->local_consumed = 0; + c->local_maxpacket = maxpack; ++ c->dynamic_window = 0; + c->remote_id = -1; + c->remote_name = xstrdup(remote_name); + c->remote_window = 0; +@@ -808,11 +815,35 @@ channel_pre_open_13(Channel *c, fd_set *readset, fd_set *writeset) + FD_SET(c->sock, writeset); + } + ++int channel_tcpwinsz () { ++ u_int32_t tcpwinsz = 0; ++ socklen_t optsz = sizeof(tcpwinsz); ++ int ret = -1; ++ ++ /* if we aren't on a socket return 128KB*/ ++ if(!packet_connection_is_on_socket()) ++ return(128*1024); ++ ret = getsockopt(packet_get_connection_in(), ++ SOL_SOCKET, SO_RCVBUF, &tcpwinsz, &optsz); ++ /* return no more than 64MB */ ++ if ((ret == 0) && tcpwinsz > BUFFER_MAX_LEN_HPN) ++ tcpwinsz = BUFFER_MAX_LEN_HPN; ++ debug2("tcpwinsz: %d for connection: %d", tcpwinsz, ++ packet_get_connection_in()); ++ return(tcpwinsz); ++} ++ + static void + channel_pre_open(Channel *c, fd_set *readset, fd_set *writeset) + { + u_int limit = compat20 ? c->remote_window : packet_get_maxsize(); + ++ /* check buffer limits */ ++ if ((!c->tcpwinsz) || (c->dynamic_window > 0)) ++ c->tcpwinsz = channel_tcpwinsz(); ++ ++ limit = MIN(limit, 2 * c->tcpwinsz); ++ + if (c->istate == CHAN_INPUT_OPEN && + limit > 0 && + buffer_len(&c->input) < limit && +@@ -1789,14 +1820,21 @@ channel_check_window(Channel *c) + c->local_maxpacket*3) || + c->local_window < c->local_window_max/2) && + c->local_consumed > 0) { ++ u_int addition = 0; ++ /* adjust max window size if we are in a dynamic environment */ ++ if (c->dynamic_window && (c->tcpwinsz > c->local_window_max)) { ++ /* grow the window somewhat aggressively to maintain pressure */ ++ addition = 1.5*(c->tcpwinsz - c->local_window_max); ++ c->local_window_max += addition; ++ } + packet_start(SSH2_MSG_CHANNEL_WINDOW_ADJUST); + packet_put_int(c->remote_id); +- packet_put_int(c->local_consumed); ++ packet_put_int(c->local_consumed + addition); + packet_send(); + debug2("channel %d: window %d sent adjust %d", + c->self, c->local_window, + c->local_consumed); +- c->local_window += c->local_consumed; ++ c->local_window += c->local_consumed + addition; + c->local_consumed = 0; + } + return 1; +@@ -2128,11 +2166,12 @@ channel_after_select(fd_set *readset, fd_set *writeset) + + + /* If there is data to send to the connection, enqueue some of it now. */ +-void ++int + channel_output_poll(void) + { + Channel *c; + u_int i, len; ++ int packet_length = 0; + + for (i = 0; i < channels_alloc; i++) { + c = channels[i]; +@@ -2180,7 +2219,7 @@ channel_output_poll(void) + packet_start(SSH2_MSG_CHANNEL_DATA); + packet_put_int(c->remote_id); + packet_put_string(data, dlen); +- packet_send(); ++ packet_length = packet_send(); + c->remote_window -= dlen + 4; + xfree(data); + } +@@ -2210,7 +2249,7 @@ channel_output_poll(void) + SSH2_MSG_CHANNEL_DATA : SSH_MSG_CHANNEL_DATA); + packet_put_int(c->remote_id); + packet_put_string(buffer_ptr(&c->input), len); +- packet_send(); ++ packet_length = packet_send(); + buffer_consume(&c->input, len); + c->remote_window -= len; + } +@@ -2245,12 +2284,13 @@ channel_output_poll(void) + packet_put_int(c->remote_id); + packet_put_int(SSH2_EXTENDED_DATA_STDERR); + packet_put_string(buffer_ptr(&c->extended), len); +- packet_send(); ++ packet_length = packet_send(); + buffer_consume(&c->extended, len); + c->remote_window -= len; + debug2("channel %d: sent ext data %d", c->self, len); + } + } ++ return (packet_length); + } + + +@@ -2634,6 +2674,15 @@ channel_set_af(int af) + IPv4or6 = af; + } + ++ ++void ++channel_set_hpn(int external_hpn_disabled, int external_hpn_buffer_size) ++{ ++ hpn_disabled = external_hpn_disabled; ++ hpn_buffer_size = external_hpn_buffer_size; ++ debug("HPN Disabled: %d, HPN Buffer Size: %d", hpn_disabled, hpn_buffer_size); ++} ++ + static int + channel_setup_fwd_listener(int type, const char *listen_addr, + u_short listen_port, int *allocated_listen_port, +@@ -2787,9 +2836,15 @@ channel_setup_fwd_listener(int type, const char *listen_addr, + } + + /* Allocate a channel number for the socket. */ ++ /* explicitly test for hpn disabled option. if true use smaller window size */ ++ if (hpn_disabled) + c = channel_new("port listener", type, sock, sock, -1, + CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, + 0, "port listener", 1); ++ else ++ c = channel_new("port listener", type, sock, sock, -1, ++ hpn_buffer_size, CHAN_TCP_PACKET_DEFAULT, ++ 0, "port listener", 1); + c->path = xstrdup(host); + c->host_port = port_to_connect; + c->listening_port = listen_port; +@@ -3334,10 +3389,17 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost, + *chanids = xcalloc(num_socks + 1, sizeof(**chanids)); + for (n = 0; n < num_socks; n++) { + sock = socks[n]; ++ /* Is this really necassary? */ ++ if (hpn_disabled) + nc = channel_new("x11 listener", + SSH_CHANNEL_X11_LISTENER, sock, sock, -1, + CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, + 0, "X11 inet listener", 1); ++ else ++ nc = channel_new("x11 listener", ++ SSH_CHANNEL_X11_LISTENER, sock, sock, -1, ++ hpn_buffer_size, CHAN_X11_PACKET_DEFAULT, ++ 0, "X11 inet listener", 1); + nc->single_connection = single_connection; + (*chanids)[n] = nc->self; + } +diff --git a/channels.h b/channels.h +index e2941c8..fa90ccf 100644 +--- a/channels.h ++++ b/channels.h +@@ -125,8 +125,10 @@ struct Channel { + u_int local_window_max; + u_int local_consumed; + u_int local_maxpacket; ++ int dynamic_window; + int extended_usage; + int single_connection; ++ u_int tcpwinsz; + + char *ctype; /* type */ + +@@ -161,9 +163,11 @@ struct Channel { + + /* default window/packet sizes for tcp/x11-fwd-channel */ + #define CHAN_SES_PACKET_DEFAULT (32*1024) +-#define CHAN_SES_WINDOW_DEFAULT (64*CHAN_SES_PACKET_DEFAULT) ++#define CHAN_SES_WINDOW_DEFAULT (4*CHAN_SES_PACKET_DEFAULT) ++ + #define CHAN_TCP_PACKET_DEFAULT (32*1024) +-#define CHAN_TCP_WINDOW_DEFAULT (64*CHAN_TCP_PACKET_DEFAULT) ++#define CHAN_TCP_WINDOW_DEFAULT (4*CHAN_TCP_PACKET_DEFAULT) ++ + #define CHAN_X11_PACKET_DEFAULT (16*1024) + #define CHAN_X11_WINDOW_DEFAULT (4*CHAN_X11_PACKET_DEFAULT) + +@@ -237,7 +241,7 @@ void channel_input_status_confirm(int, u_int32_t, void *); + + void channel_prepare_select(fd_set **, fd_set **, int *, u_int*, int); + void channel_after_select(fd_set *, fd_set *); +-void channel_output_poll(void); ++int channel_output_poll(void); + + int channel_not_very_much_buffered_data(void); + void channel_close_all(void); +@@ -294,4 +298,7 @@ void chan_rcvd_ieof(Channel *); + void chan_write_failed(Channel *); + void chan_obuf_empty(Channel *); + ++/* hpn handler */ ++void channel_set_hpn(int, int); ++ + #endif +diff --git a/cipher.c b/cipher.c +index bb5c0ac..32ad40e 100644 +--- a/cipher.c ++++ b/cipher.c +@@ -163,7 +163,8 @@ ciphers_valid(const char *names) + for ((p = strsep(&cp, CIPHER_SEP)); p && *p != '\0'; + (p = strsep(&cp, CIPHER_SEP))) { + c = cipher_by_name(p); +- if (c == NULL || c->number != SSH_CIPHER_SSH2) { ++ if (c == NULL || (c->number != SSH_CIPHER_SSH2 && ++ c->number != SSH_CIPHER_NONE)) { + debug("bad cipher %s [%s]", p, names); + xfree(cipher_list); + return 0; +@@ -337,6 +338,7 @@ cipher_get_keyiv(CipherContext *cc, u_char *iv, u_int len) + int evplen; + + switch (c->number) { ++ case SSH_CIPHER_NONE: + case SSH_CIPHER_SSH2: + case SSH_CIPHER_DES: + case SSH_CIPHER_BLOWFISH: +@@ -371,6 +373,7 @@ cipher_set_keyiv(CipherContext *cc, u_char *iv) + int evplen = 0; + + switch (c->number) { ++ case SSH_CIPHER_NONE: + case SSH_CIPHER_SSH2: + case SSH_CIPHER_DES: + case SSH_CIPHER_BLOWFISH: +diff --git a/clientloop.c b/clientloop.c +index c19b01f..8de3984 100644 +--- a/clientloop.c ++++ b/clientloop.c +@@ -1793,9 +1793,15 @@ client_request_x11(const char *request_type, int rchan) + sock = x11_connect_display(); + if (sock < 0) + return NULL; ++ /* again is this really necessary for X11? */ ++ if (options.hpn_disabled) + c = channel_new("x11", + SSH_CHANNEL_X11_OPEN, sock, sock, -1, + CHAN_TCP_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, 0, "x11", 1); ++ else ++ c = channel_new("x11", ++ SSH_CHANNEL_X11_OPEN, sock, sock, -1, ++ options.hpn_buffer_size, CHAN_X11_PACKET_DEFAULT, 0, "x11", 1); + c->force_drain = 1; + return c; + } +@@ -1815,9 +1821,15 @@ client_request_agent(const char *request_type, int rchan) + sock = ssh_get_authentication_socket(); + if (sock < 0) + return NULL; ++ 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, ++ "authentication agent connection", 1); ++ else + c = channel_new("authentication agent connection", + SSH_CHANNEL_OPEN, sock, sock, -1, +- CHAN_X11_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, ++ options.hpn_buffer_size, options.hpn_buffer_size, 0, + "authentication agent connection", 1); + c->force_drain = 1; + return c; +@@ -1845,10 +1857,18 @@ client_request_tun_fwd(int tun_mode, int local_tun, int remote_tun) + return -1; + } + ++ if(options.hpn_disabled) + c = channel_new("tun", SSH_CHANNEL_OPENING, fd, fd, -1, +- CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, 0, "tun", 1); ++ CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, ++ 0, "tun", 1); ++ else ++ c = channel_new("tun", SSH_CHANNEL_OPENING, fd, fd, -1, ++ options.hpn_buffer_size, CHAN_TCP_PACKET_DEFAULT, ++ 0, "tun", 1); + c->datagram = 1; + ++ ++ + #if defined(SSH_TUN_FILTER) + if (options.tun_open == SSH_TUNMODE_POINTOPOINT) + channel_register_filter(c->self, sys_tun_infilter, +diff --git a/compat.c b/compat.c +index df3541d..0b3df86 100644 +--- a/compat.c ++++ b/compat.c +@@ -170,6 +170,15 @@ compat_datafellows(const char *version) + strlen(check[i].pat), 0) == 1) { + debug("match: %s pat %s", version, check[i].pat); + datafellows = check[i].bugs; ++ /* Check to see if the remote side is OpenSSH and not HPN */ ++ if(strstr(version,"OpenSSH") != NULL) ++ { ++ if (strstr(version,"hpn") == NULL) ++ { ++ datafellows |= SSH_BUG_LARGEWINDOW; ++ debug("Remote is NON-HPN aware"); ++ } ++ } + return; + } + } +diff --git a/compat.h b/compat.h +index 16cf282..6feaa6b 100644 +--- a/compat.h ++++ b/compat.h +@@ -58,6 +58,7 @@ + #define SSH_OLD_FORWARD_ADDR 0x01000000 + #define SSH_BUG_RFWD_ADDR 0x02000000 + #define SSH_NEW_OPENSSH 0x04000000 ++#define SSH_BUG_LARGEWINDOW 0x08000000 + + void enable_compat13(void); + void enable_compat20(void); +diff --git a/kex.c b/kex.c +index c65e28f..e99b244 100644 +--- a/kex.c ++++ b/kex.c +@@ -49,6 +49,7 @@ + #include "dispatch.h" + #include "monitor.h" + #include "roaming.h" ++#include "canohost.h" + + #if OPENSSL_VERSION_NUMBER >= 0x00907000L + # if defined(HAVE_EVP_SHA256) +@@ -91,7 +92,8 @@ kex_names_valid(const char *names) + } + + /* put algorithm proposal into buffer */ +-static void ++/* used in sshconnect.c as well as kex.c */ ++void + kex_prop2buf(Buffer *b, char *proposal[PROPOSAL_MAX]) + { + u_int i; +@@ -407,6 +409,13 @@ kex_choose_conf(Kex *kex) + int nenc, nmac, ncomp; + u_int mode, ctos, need; + int first_kex_follows, type; ++ int log_flag = 0; ++ ++ int auth_flag; ++ ++ auth_flag = packet_authentication_state(); ++ ++ debug ("AUTH STATE IS %d", auth_flag); + + my = kex_buf2prop(&kex->my, NULL); + peer = kex_buf2prop(&kex->peer, &first_kex_follows); +@@ -441,11 +450,34 @@ kex_choose_conf(Kex *kex) + choose_enc (&newkeys->enc, cprop[nenc], sprop[nenc]); + choose_mac (&newkeys->mac, cprop[nmac], sprop[nmac]); + choose_comp(&newkeys->comp, cprop[ncomp], sprop[ncomp]); ++ debug("REQUESTED ENC.NAME is '%s'", newkeys->enc.name); ++ if (strcmp(newkeys->enc.name, "none") == 0) { ++ debug("Requesting NONE. Authflag is %d", auth_flag); ++ if (auth_flag == 1) { ++ debug("None requested post authentication."); ++ } else { ++ fatal("Pre-authentication none cipher requests are not allowed."); ++ } ++ } + debug("kex: %s %s %s %s", + ctos ? "client->server" : "server->client", + newkeys->enc.name, + newkeys->mac.name, + newkeys->comp.name); ++ /* client starts withctos = 0 && log flag = 0 and no log*/ ++ /* 2nd client pass ctos=1 and flag = 1 so no log*/ ++ /* server starts with ctos =1 && log_flag = 0 so log */ ++ /* 2nd sever pass ctos = 1 && log flag = 1 so no log*/ ++ /* -cjr*/ ++ if (ctos && !log_flag) { ++ logit("SSH: Server;Ltype: Kex;Remote: %s-%d;Enc: %s;MAC: %s;Comp: %s", ++ get_remote_ipaddr(), ++ get_remote_port(), ++ newkeys->enc.name, ++ newkeys->mac.name, ++ newkeys->comp.name); ++ } ++ log_flag = 1; + } + choose_kex(kex, cprop[PROPOSAL_KEX_ALGS], sprop[PROPOSAL_KEX_ALGS]); + choose_hostkeyalg(kex, cprop[PROPOSAL_SERVER_HOST_KEY_ALGS], +diff --git a/kex.h b/kex.h +index 7373d3c..3b4d4b5 100644 +--- a/kex.h ++++ b/kex.h +@@ -140,6 +140,8 @@ struct Kex { + + int kex_names_valid(const char *); + ++void kex_prop2buf(Buffer *, char *proposal[PROPOSAL_MAX]); ++ + Kex *kex_setup(char *[PROPOSAL_MAX]); + void kex_finish(Kex *); + +diff --git a/myproposal.h b/myproposal.h +index 0bc1c77..e9b273d 100644 +--- a/myproposal.h ++++ b/myproposal.h +@@ -97,6 +97,8 @@ + #define KEX_DEFAULT_COMP "none,zlib@openssh.com,zlib" + #define KEX_DEFAULT_LANG "" + ++#define KEX_ENCRYPT_INCLUDE_NONE KEX_DEFAULT_ENCRYPT \ ++ ",none" + + static char *myproposal[PROPOSAL_MAX] = { + KEX_DEFAULT_KEX, +diff --git a/packet.c b/packet.c +index ba93417..d16140a 100644 +--- a/packet.c ++++ b/packet.c +@@ -840,7 +840,7 @@ packet_enable_delayed_compress(void) + /* + * Finalize packet in SSH2 format (compress, mac, encrypt, enqueue) + */ +-static void ++static int + packet_send2_wrapped(void) + { + u_char type, *cp, *macbuf = NULL; +@@ -959,11 +959,13 @@ packet_send2_wrapped(void) + set_newkeys(MODE_OUT); + else if (type == SSH2_MSG_USERAUTH_SUCCESS && active_state->server_side) + packet_enable_delayed_compress(); ++ return(packet_length); + } + +-static void ++static int + packet_send2(void) + { ++ static int packet_length = 0; + struct packet *p; + u_char type, *cp; + +@@ -981,7 +983,7 @@ packet_send2(void) + sizeof(Buffer)); + buffer_init(&active_state->outgoing_packet); + TAILQ_INSERT_TAIL(&active_state->outgoing, p, next); +- return; ++ return(sizeof(Buffer)); + } + } + +@@ -989,7 +991,7 @@ packet_send2(void) + if (type == SSH2_MSG_KEXINIT) + active_state->rekeying = 1; + +- packet_send2_wrapped(); ++ packet_length = packet_send2_wrapped(); + + /* after a NEWKEYS message we can send the complete queue */ + if (type == SSH2_MSG_NEWKEYS) { +@@ -1002,19 +1004,22 @@ packet_send2(void) + sizeof(Buffer)); + TAILQ_REMOVE(&active_state->outgoing, p, next); + xfree(p); +- packet_send2_wrapped(); ++ packet_length += packet_send2_wrapped(); + } + } ++ return(packet_length); + } + +-void ++int + packet_send(void) + { ++ int packet_len = 0; + if (compat20) +- packet_send2(); ++ packet_len = packet_send2(); + else + packet_send1(); + DBG(debug("packet_send done")); ++ return(packet_len); + } + + /* +@@ -1653,7 +1658,7 @@ packet_disconnect(const char *fmt,...) + + /* Checks if there is any buffered output, and tries to write some of the output. */ + +-void ++int + packet_write_poll(void) + { + int len = buffer_len(&active_state->output); +@@ -1666,13 +1671,14 @@ packet_write_poll(void) + if (len == -1) { + if (errno == EINTR || errno == EAGAIN || + errno == EWOULDBLOCK) +- return; ++ return(0); + fatal("Write failed: %.100s", strerror(errno)); + } + if (len == 0 && !cont) + fatal("Write connection closed"); + buffer_consume(&active_state->output, len); + } ++ return(len); + } + + /* +@@ -1873,12 +1879,24 @@ packet_send_ignore(int nbytes) + } + } + ++int rekey_requested = 0; ++void ++packet_request_rekeying(void) ++{ ++ rekey_requested = 1; ++} ++ + #define MAX_PACKETS (1U<<31) + int + packet_need_rekeying(void) + { + if (datafellows & SSH_BUG_NOREKEY) + return 0; ++ if (rekey_requested == 1) ++ { ++ rekey_requested = 0; ++ return 1; ++ } + return + (active_state->p_send.packets > MAX_PACKETS) || + (active_state->p_read.packets > MAX_PACKETS) || +@@ -1970,3 +1988,9 @@ packet_restore_state(void) + add_recv_bytes(len); + } + } ++ ++int ++packet_authentication_state(void) ++{ ++ return(active_state->after_authentication); ++} +diff --git a/packet.h b/packet.h +index 90eec17..4730824 100644 +--- a/packet.h ++++ b/packet.h +@@ -23,6 +23,9 @@ + #include <openssl/ec.h> + #endif + ++void ++packet_request_rekeying(void); ++ + void packet_set_connection(int, int); + void packet_set_timeout(int, int); + void packet_set_nonblocking(void); +@@ -38,6 +41,7 @@ void packet_set_interactive(int, int, int); + int packet_is_interactive(void); + void packet_set_server(void); + void packet_set_authenticated(void); ++int packet_authentication_state(void); + + void packet_start(u_char); + void packet_put_char(int ch); +@@ -51,7 +55,7 @@ void packet_put_ecpoint(const EC_GROUP *, const EC_POINT *); + void packet_put_string(const void *buf, u_int len); + void packet_put_cstring(const char *str); + void packet_put_raw(const void *buf, u_int len); +-void packet_send(void); ++int packet_send(void); + + int packet_read(void); + void packet_read_expect(int type); +@@ -86,7 +90,7 @@ int packet_get_ssh1_cipher(void); + void packet_set_iv(int, u_char *); + void *packet_get_newkeys(int); + +-void packet_write_poll(void); ++int packet_write_poll(void); + void packet_write_wait(void); + int packet_have_data_to_write(void); + int packet_not_very_much_data_to_write(void); +diff --git a/readconf.c b/readconf.c +index 91dfa56..7d3e695 100644 +--- a/readconf.c ++++ b/readconf.c +@@ -135,6 +135,8 @@ typedef enum { + oTunnel, oTunnelDevice, oLocalCommand, oPermitLocalCommand, + oVisualHostKey, oUseRoaming, oZeroKnowledgePasswordAuthentication, + oKexAlgorithms, oIPQoS, oRequestTTY, ++ oNoneEnabled, oTcpRcvBufPoll, oTcpRcvBuf, oNoneSwitch, oHPNDisabled, ++ oHPNBufferSize, + oDeprecated, oUnsupported + } OpCodes; + +@@ -247,6 +249,13 @@ static struct { + { "ipqos", oIPQoS }, + { "requesttty", oRequestTTY }, + ++ { "noneenabled", oNoneEnabled }, ++ { "tcprcvbufpoll", oTcpRcvBufPoll }, ++ { "tcprcvbuf", oTcpRcvBuf }, ++ { "noneswitch", oNoneSwitch }, ++ { "hpndisabled", oHPNDisabled }, ++ { "hpnbuffersize", oHPNBufferSize }, ++ + { NULL, oBadOption } + }; + +@@ -494,6 +503,36 @@ parse_flag: + intptr = &options->check_host_ip; + goto parse_flag; + ++ case oNoneEnabled: ++ intptr = &options->none_enabled; ++ goto parse_flag; ++ ++ /* we check to see if the command comes from the */ ++ /* command line or not. If it does then enable it */ ++ /* otherwise fail. NONE should never be a default configuration */ ++ case oNoneSwitch: ++ if(strcmp(filename,"command-line") == 0) { ++ intptr = &options->none_switch; ++ goto parse_flag; ++ } else { ++ error("NoneSwitch is found in %.200s.\nYou may only use this configuration option from the command line", filename); ++ error("Continuing..."); ++ debug("NoneSwitch directive found in %.200s.", filename); ++ return 0; ++ } ++ ++ case oHPNDisabled: ++ intptr = &options->hpn_disabled; ++ goto parse_flag; ++ ++ case oHPNBufferSize: ++ intptr = &options->hpn_buffer_size; ++ goto parse_int; ++ ++ case oTcpRcvBufPoll: ++ intptr = &options->tcp_rcv_buf_poll; ++ goto parse_flag; ++ + case oVerifyHostKeyDNS: + intptr = &options->verify_host_key_dns; + goto parse_yesnoask; +@@ -679,6 +718,10 @@ parse_int: + intptr = &options->connection_attempts; + goto parse_int; + ++ case oTcpRcvBuf: ++ intptr = &options->tcp_rcv_buf; ++ goto parse_int; ++ + case oCipher: + intptr = &options->cipher; + arg = strdelim(&s); +@@ -1202,6 +1245,13 @@ initialize_options(Options * options) + options->ip_qos_interactive = -1; + options->ip_qos_bulk = -1; + options->request_tty = -1; ++ ++ options->none_switch = -1; ++ options->none_enabled = -1; ++ options->hpn_disabled = -1; ++ options->hpn_buffer_size = -1; ++ options->tcp_rcv_buf_poll = -1; ++ options->tcp_rcv_buf = -1; + } + + /* +@@ -1338,6 +1388,29 @@ fill_default_options(Options * options) + options->server_alive_interval = 0; + if (options->server_alive_count_max == -1) + options->server_alive_count_max = 3; ++ if (options->none_switch == -1) ++ options->none_switch = 0; ++ if (options->hpn_disabled == -1) ++ options->hpn_disabled = 0; ++ if (options->hpn_buffer_size > -1) ++ { ++ /* if a user tries to set the size to 0 set it to 1KB */ ++ if (options->hpn_buffer_size == 0) ++ options->hpn_buffer_size = 1024; ++ /*limit the buffer to 64MB*/ ++ if (options->hpn_buffer_size > 65536) ++ { ++ options->hpn_buffer_size = 65536*1024; ++ debug("User requested buffer larger than 64MB. Request reverted to 64MB"); ++ } ++ debug("hpn_buffer_size set to %d", options->hpn_buffer_size); ++ } ++ if (options->tcp_rcv_buf == 0) ++ options->tcp_rcv_buf = 1; ++ if (options->tcp_rcv_buf > -1) ++ options->tcp_rcv_buf *=1024; ++ if (options->tcp_rcv_buf_poll == -1) ++ options->tcp_rcv_buf_poll = 1; + if (options->control_master == -1) + options->control_master = 0; + if (options->control_persist == -1) { +diff --git a/readconf.h b/readconf.h +index 5944cff..bfcddf7 100644 +--- a/readconf.h ++++ b/readconf.h +@@ -60,6 +60,10 @@ typedef struct { + int compression_level; /* Compression level 1 (fast) to 9 + * (best). */ + int tcp_keep_alive; /* Set SO_KEEPALIVE. */ ++ int tcp_rcv_buf; /* user switch to set tcp recv buffer */ ++ int tcp_rcv_buf_poll; /* Option to poll recv buf every window transfer */ ++ int hpn_disabled; /* Switch to disable HPN buffer management */ ++ int hpn_buffer_size; /* User definable size for HPN buffer window */ + int ip_qos_interactive; /* IP ToS/DSCP/class for interactive */ + int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */ + LogLevel log_level; /* Level for logging. */ +@@ -108,6 +112,8 @@ typedef struct { + + int enable_ssh_keysign; + int64_t rekey_limit; ++ int none_switch; /* Use none cipher */ ++ int none_enabled; /* Allow none to be used */ + int no_host_authentication_for_localhost; + int identities_only; + int server_alive_interval; +diff --git a/scp.c b/scp.c +index 18b2597..3841f10 100644 +--- a/scp.c ++++ b/scp.c +@@ -727,7 +727,7 @@ source(int argc, char **argv) + off_t i, statbytes; + size_t amt; + int fd = -1, haderr, indx; +- char *last, *name, buf[2048], encname[MAXPATHLEN]; ++ char *last, *name, buf[16384], encname[MAXPATHLEN]; + int len; + + for (indx = 0; indx < argc; ++indx) { +@@ -909,7 +909,7 @@ sink(int argc, char **argv) + mode_t mode, omode, mask; + off_t size, statbytes; + int setimes, targisdir, wrerrno = 0; +- char ch, *cp, *np, *targ, *why, *vect[1], buf[2048]; ++ char ch, *cp, *np, *targ, *why, *vect[1], buf[16384]; + struct timeval tv[2]; + + #define atime tv[0] +diff --git a/servconf.c b/servconf.c +index 91986e5..d5e45bc 100644 +--- a/servconf.c ++++ b/servconf.c +@@ -136,6 +136,10 @@ initialize_server_options(ServerOptions *options) + options->revoked_keys_file = NULL; + options->trusted_user_ca_keys = NULL; + options->authorized_principals_file = NULL; ++ options->none_enabled = -1; ++ options->tcp_rcv_buf_poll = -1; ++ options->hpn_disabled = -1; ++ options->hpn_buffer_size = -1; + options->ip_qos_interactive = -1; + options->ip_qos_bulk = -1; + } +@@ -143,6 +147,11 @@ initialize_server_options(ServerOptions *options) + void + fill_default_server_options(ServerOptions *options) + { ++ /* needed for hpn socket tests */ ++ int sock; ++ int socksize; ++ int socksizelen = sizeof(int); ++ + /* Portable-specific options */ + if (options->use_pam == -1) + options->use_pam = 0; +@@ -278,6 +287,41 @@ fill_default_server_options(ServerOptions *options) + if (options->ip_qos_bulk == -1) + options->ip_qos_bulk = IPTOS_THROUGHPUT; + ++ if (options->hpn_disabled == -1) ++ options->hpn_disabled = 0; ++ ++ if (options->hpn_buffer_size == -1) { ++ /* option not explicitly set. Now we have to figure out */ ++ /* what value to use */ ++ if (options->hpn_disabled == 1) { ++ options->hpn_buffer_size = CHAN_SES_WINDOW_DEFAULT; ++ } else { ++ /* get the current RCV size and set it to that */ ++ /*create a socket but don't connect it */ ++ /* we use that the get the rcv socket size */ ++ sock = socket(AF_INET, SOCK_STREAM, 0); ++ getsockopt(sock, SOL_SOCKET, SO_RCVBUF, ++ &socksize, &socksizelen); ++ close(sock); ++ options->hpn_buffer_size = socksize; ++ debug ("HPN Buffer Size: %d", options->hpn_buffer_size); ++ } ++ } else { ++ /* we have to do this incase the user sets both values in a contradictory */ ++ /* manner. hpn_disabled overrrides hpn_buffer_size*/ ++ if (options->hpn_disabled <= 0) { ++ if (options->hpn_buffer_size == 0) ++ options->hpn_buffer_size = 1; ++ /* limit the maximum buffer to 64MB */ ++ if (options->hpn_buffer_size > 64*1024) { ++ options->hpn_buffer_size = 64*1024*1024; ++ } else { ++ options->hpn_buffer_size *= 1024; ++ } ++ } else ++ options->hpn_buffer_size = CHAN_TCP_WINDOW_DEFAULT; ++ } ++ + /* Turn privilege separation on by default */ + if (use_privsep == -1) + use_privsep = PRIVSEP_ON; +@@ -323,6 +367,7 @@ typedef enum { + sUsePrivilegeSeparation, sAllowAgentForwarding, + sZeroKnowledgePasswordAuthentication, sHostCertificate, + sRevokedKeys, sTrustedUserCAKeys, sAuthorizedPrincipalsFile, ++ sNoneEnabled, sTcpRcvBufPoll, sHPNDisabled, sHPNBufferSize, + sKexAlgorithms, sIPQoS, + sDeprecated, sUnsupported + } ServerOpCodes; +@@ -446,6 +491,10 @@ static struct { + { "revokedkeys", sRevokedKeys, SSHCFG_ALL }, + { "trustedusercakeys", sTrustedUserCAKeys, SSHCFG_ALL }, + { "authorizedprincipalsfile", sAuthorizedPrincipalsFile, SSHCFG_ALL }, ++ { "noneenabled", sNoneEnabled, SSHCFG_ALL }, ++ { "hpndisabled", sHPNDisabled, SSHCFG_ALL }, ++ { "hpnbuffersize", sHPNBufferSize, SSHCFG_ALL }, ++ { "tcprcvbufpoll", sTcpRcvBufPoll, SSHCFG_ALL }, + { "kexalgorithms", sKexAlgorithms, SSHCFG_GLOBAL }, + { "ipqos", sIPQoS, SSHCFG_ALL }, + { NULL, sBadOption, 0 } +@@ -474,6 +523,7 @@ parse_token(const char *cp, const char *filename, + + for (i = 0; keywords[i].name; i++) + if (strcasecmp(cp, keywords[i].name) == 0) { ++ debug ("Config token is %s", keywords[i].name); + *flags = keywords[i].flags; + return keywords[i].opcode; + } +@@ -918,6 +968,22 @@ process_server_config_line(ServerOptions *options, char *line, + *intptr = value; + break; + ++ case sNoneEnabled: ++ intptr = &options->none_enabled; ++ goto parse_flag; ++ ++ case sTcpRcvBufPoll: ++ intptr = &options->tcp_rcv_buf_poll; ++ goto parse_flag; ++ ++ case sHPNDisabled: ++ intptr = &options->hpn_disabled; ++ goto parse_flag; ++ ++ case sHPNBufferSize: ++ intptr = &options->hpn_buffer_size; ++ goto parse_int; ++ + case sIgnoreUserKnownHosts: + intptr = &options->ignore_user_known_hosts; + goto parse_flag; +diff --git a/servconf.h b/servconf.h +index 89f38e2..3a2510a 100644 +--- a/servconf.h ++++ b/servconf.h +@@ -157,6 +157,10 @@ typedef struct { + char *adm_forced_command; + + int use_pam; /* Enable auth via PAM */ ++ int none_enabled; /* enable NONE cipher switch */ ++ int tcp_rcv_buf_poll; /* poll tcp rcv window in autotuning kernels*/ ++ int hpn_disabled; /* disable hpn functionality. false by default */ ++ int hpn_buffer_size; /* set the hpn buffer size - default 3MB */ + + int permit_tun; + +diff --git a/serverloop.c b/serverloop.c +index 19b84ff..38d8bdc 100644 +--- a/serverloop.c ++++ b/serverloop.c +@@ -94,10 +94,10 @@ static int fdin; /* Descriptor for stdin (for writing) */ + static int fdout; /* Descriptor for stdout (for reading); + May be same number as fdin. */ + static int fderr; /* Descriptor for stderr. May be -1. */ +-static long stdin_bytes = 0; /* Number of bytes written to stdin. */ +-static long stdout_bytes = 0; /* Number of stdout bytes sent to client. */ +-static long stderr_bytes = 0; /* Number of stderr bytes sent to client. */ +-static long fdout_bytes = 0; /* Number of stdout bytes read from program. */ ++static u_long stdin_bytes = 0; /* Number of bytes written to stdin. */ ++static u_long stdout_bytes = 0; /* Number of stdout bytes sent to client. */ ++static u_long stderr_bytes = 0; /* Number of stderr bytes sent to client. */ ++static u_long fdout_bytes = 0; /* Number of stdout bytes read from program. */ + static int stdin_eof = 0; /* EOF message received from client. */ + static int fdout_eof = 0; /* EOF encountered reading from fdout. */ + static int fderr_eof = 0; /* EOF encountered readung from fderr. */ +@@ -122,6 +122,20 @@ static volatile sig_atomic_t received_sigterm = 0; + static void server_init_dispatch(void); + + /* ++ * Returns current time in seconds from Jan 1, 1970 with the maximum ++ * available resolution. ++ */ ++ ++static double ++get_current_time(void) ++{ ++ struct timeval tv; ++ gettimeofday(&tv, NULL); ++ return (double) tv.tv_sec + (double) tv.tv_usec / 1000000.0; ++} ++ ++ ++/* + * we write to this pipe if a SIGCHLD is caught in order to avoid + * the race between select() and child_terminated + */ +@@ -414,6 +428,7 @@ process_input(fd_set *readset) + } else { + /* Buffer any received data. */ + packet_process_incoming(buf, len); ++ fdout_bytes += len; + } + } + if (compat20) +@@ -436,6 +451,7 @@ process_input(fd_set *readset) + } else { + buffer_append(&stdout_buffer, buf, len); + fdout_bytes += len; ++ debug ("FD out now: %ld", fdout_bytes); + } + } + /* Read and buffer any available stderr data from the program. */ +@@ -503,7 +519,7 @@ process_output(fd_set *writeset) + } + /* Send any buffered packet data to the client. */ + if (FD_ISSET(connection_out, writeset)) +- packet_write_poll(); ++ stdin_bytes += packet_write_poll(); + } + + /* +@@ -820,8 +836,10 @@ server_loop2(Authctxt *authctxt) + { + fd_set *readset = NULL, *writeset = NULL; + int rekeying = 0, max_fd, nalloc = 0; ++ double start_time, total_time; + + debug("Entering interactive session for SSH2."); ++ start_time = get_current_time(); + + mysignal(SIGCHLD, sigchld_handler); + child_terminated = 0; +@@ -883,6 +901,11 @@ server_loop2(Authctxt *authctxt) + + /* free remaining sessions, e.g. remove wtmp entries */ + session_destroy_all(NULL); ++ total_time = get_current_time() - start_time; ++ logit("SSH: Server;LType: Throughput;Remote: %s-%d;IN: %lu;OUT: %lu;Duration: %.1f;tPut_in: %.1f;tPut_out: %.1f", ++ get_remote_ipaddr(), get_remote_port(), ++ stdin_bytes, fdout_bytes, total_time, stdin_bytes / total_time, ++ fdout_bytes / total_time); + } + + static void +@@ -998,8 +1021,12 @@ 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->datagram = 1; + #if defined(SSH_TUN_FILTER) + if (mode == SSH_TUNMODE_POINTOPOINT) +@@ -1035,6 +1062,8 @@ 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.tcp_rcv_buf_poll) && (!options.hpn_disabled)) ++ c->dynamic_window = 1; + if (session_open(the_authctxt, c->self) != 1) { + debug("session open failed, free channel %d", c->self); + channel_free(c); +diff --git a/session.c b/session.c +index 6a70400..4ffffe0 100644 +--- a/session.c ++++ b/session.c +@@ -236,6 +236,7 @@ auth_input_request_forwarding(struct passwd * pw) + } + + /* Allocate a channel for the authentication agent socket. */ ++ /* this shouldn't matter if its hpn or not - cjr */ + nc = channel_new("auth socket", + SSH_CHANNEL_AUTH_SOCKET, sock, sock, -1, + CHAN_X11_WINDOW_DEFAULT, CHAN_X11_PACKET_DEFAULT, +@@ -2278,10 +2279,16 @@ session_set_fds(Session *s, int fdin, int fdout, int fderr, int ignore_fderr, + */ + if (s->chanid == -1) + fatal("no channel for session %d", s->self); ++ if (options.hpn_disabled) + channel_set_fds(s->chanid, + fdout, fdin, fderr, + ignore_fderr ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ, + 1, is_tty, CHAN_SES_WINDOW_DEFAULT); ++ else ++ channel_set_fds(s->chanid, ++ fdout, fdin, fderr, ++ ignore_fderr ? CHAN_EXTENDED_IGNORE : CHAN_EXTENDED_READ, ++ 1, is_tty, options.hpn_buffer_size); + } + + /* +diff --git a/sftp.1 b/sftp.1 +index eb88014..afb092b 100644 +--- a/sftp.1 ++++ b/sftp.1 +@@ -245,7 +245,8 @@ diagnostic messages from + Specify how many requests may be outstanding at any one time. + Increasing this may slightly improve file transfer speed + but will increase memory usage. +-The default is 64 outstanding requests. ++The default is 256 outstanding requests providing for 8MB ++of outstanding data with a 32KB buffer. + .It Fl r + Recursively copy entire directories when uploading and downloading. + Note that +diff --git a/sftp.c b/sftp.c +index ab667f5..f87d5fb 100644 +--- a/sftp.c ++++ b/sftp.c +@@ -69,7 +69,7 @@ typedef void EditLine; + #include "sftp-client.h" + + #define DEFAULT_COPY_BUFLEN 32768 /* Size of buffer for up/download */ +-#define DEFAULT_NUM_REQUESTS 64 /* # concurrent outstanding requests */ ++#define DEFAULT_NUM_REQUESTS 256 /* # concurrent outstanding requests */ + + /* File to read commands from */ + FILE* infile; +diff --git a/ssh.c b/ssh.c +index c717dcf..6b71bf2 100644 +--- a/ssh.c ++++ b/ssh.c +@@ -577,6 +577,10 @@ main(int ac, char **av) + break; + case 'T': + options.request_tty = REQUEST_TTY_NO; ++ /* ensure that the user doesn't try to backdoor a */ ++ /* null cipher switch on an interactive session */ ++ /* so explicitly disable it no matter what */ ++ options.none_switch=0; + break; + case 'o': + dummy = 1; +@@ -1362,6 +1366,9 @@ ssh_session2_open(void) + { + Channel *c; + int window, packetmax, in, out, err; ++ int sock; ++ int socksize; ++ int socksizelen = sizeof(int); + + if (stdin_null_flag) { + in = open(_PATH_DEVNULL, O_RDONLY); +@@ -1382,9 +1389,74 @@ ssh_session2_open(void) + if (!isatty(err)) + set_nonblock(err); + +- window = CHAN_SES_WINDOW_DEFAULT; ++ /* we need to check to see if what they want to do about buffer */ ++ /* sizes here. In a hpn to nonhpn connection we want to limit */ ++ /* the window size to something reasonable in case the far side */ ++ /* has the large window bug. In hpn to hpn connection we want to */ ++ /* use the max window size but allow the user to override it */ ++ /* lastly if they disabled hpn then use the ssh std window size */ ++ ++ /* so why don't we just do a getsockopt() here and set the */ ++ /* ssh window to that? In the case of a autotuning receive */ ++ /* window the window would get stuck at the initial buffer */ ++ /* size generally less than 96k. Therefore we need to set the */ ++ /* maximum ssh window size to the maximum hpn buffer size */ ++ /* unless the user has specifically set the tcprcvbufpoll */ ++ /* to no. In which case we *can* just set the window to the */ ++ /* minimum of the hpn buffer size and tcp receive buffer size */ ++ ++ if (tty_flag) ++ options.hpn_buffer_size = CHAN_SES_WINDOW_DEFAULT; ++ else ++ options.hpn_buffer_size = 2*1024*1024; ++ ++ if (datafellows & SSH_BUG_LARGEWINDOW) ++ { ++ debug("HPN to Non-HPN Connection"); ++ } ++ else ++ { ++ if (options.tcp_rcv_buf_poll <= 0) ++ { ++ sock = socket(AF_INET, SOCK_STREAM, 0); ++ getsockopt(sock, SOL_SOCKET, SO_RCVBUF, ++ &socksize, &socksizelen); ++ close(sock); ++ debug("socksize %d", socksize); ++ options.hpn_buffer_size = socksize; ++ debug ("HPNBufferSize set to TCP RWIN: %d", options.hpn_buffer_size); ++ } ++ else ++ { ++ if (options.tcp_rcv_buf > 0) ++ { ++ /*create a socket but don't connect it */ ++ /* we use that the get the rcv socket size */ ++ sock = socket(AF_INET, SOCK_STREAM, 0); ++ /* if they are using the tcp_rcv_buf option */ ++ /* attempt to set the buffer size to that */ ++ if (options.tcp_rcv_buf) ++ setsockopt(sock, SOL_SOCKET, SO_RCVBUF, (void *)&options.tcp_rcv_buf, ++ sizeof(options.tcp_rcv_buf)); ++ getsockopt(sock, SOL_SOCKET, SO_RCVBUF, ++ &socksize, &socksizelen); ++ close(sock); ++ debug("socksize %d", socksize); ++ options.hpn_buffer_size = socksize; ++ debug ("HPNBufferSize set to user TCPRcvBuf: %d", options.hpn_buffer_size); ++ } ++ } ++ } ++ ++ debug("Final hpn_buffer_size = %d", options.hpn_buffer_size); ++ ++ window = options.hpn_buffer_size; ++ ++ channel_set_hpn(options.hpn_disabled, options.hpn_buffer_size); ++ + packetmax = CHAN_SES_PACKET_DEFAULT; + if (tty_flag) { ++ window = 4*CHAN_SES_PACKET_DEFAULT; + window >>= 1; + packetmax >>= 1; + } +@@ -1393,6 +1465,10 @@ ssh_session2_open(void) + window, packetmax, CHAN_EXTENDED_WRITE, + "client-session", /*nonblock*/0); + ++ if ((options.tcp_rcv_buf_poll > 0) && (!options.hpn_disabled)) { ++ c->dynamic_window = 1; ++ debug ("Enabled Dynamic Window Scaling"); ++ } + debug3("ssh_session2_open: channel_new: %d", c->self); + + channel_send_open(c->self); +diff --git a/sshconnect.c b/sshconnect.c +index 0ee7266..f90cbe2 100644 +--- a/sshconnect.c ++++ b/sshconnect.c +@@ -182,6 +182,31 @@ ssh_kill_proxy_command(void) + } + + /* ++ * Set TCP receive buffer if requested. ++ * Note: tuning needs to happen after the socket is ++ * created but before the connection happens ++ * so winscale is negotiated properly -cjr ++ */ ++static void ++ssh_set_socket_recvbuf(int sock) ++{ ++ void *buf = (void *)&options.tcp_rcv_buf; ++ int sz = sizeof(options.tcp_rcv_buf); ++ int socksize; ++ int socksizelen = sizeof(int); ++ ++ debug("setsockopt Attempting to set SO_RCVBUF to %d", options.tcp_rcv_buf); ++ if (setsockopt(sock, SOL_SOCKET, SO_RCVBUF, buf, sz) >= 0) { ++ getsockopt(sock, SOL_SOCKET, SO_RCVBUF, &socksize, &socksizelen); ++ debug("setsockopt SO_RCVBUF: %.100s %d", strerror(errno), socksize); ++ } ++ else ++ error("Couldn't set socket receive buffer to %d: %.100s", ++ options.tcp_rcv_buf, strerror(errno)); ++} ++ ++ ++/* + * Creates a (possibly privileged) socket for use as the ssh connection. + */ + static int +@@ -204,6 +229,8 @@ ssh_create_socket(int privileged, struct addrinfo *ai) + strerror(errno)); + else + debug("Allocated local port %d.", p); ++ if (options.tcp_rcv_buf > 0) ++ ssh_set_socket_recvbuf(sock); + return sock; + } + sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); +@@ -213,6 +240,9 @@ ssh_create_socket(int privileged, struct addrinfo *ai) + } + fcntl(sock, F_SETFD, FD_CLOEXEC); + ++ if (options.tcp_rcv_buf > 0) ++ ssh_set_socket_recvbuf(sock); ++ + /* Bind the socket to an alternative local IP address */ + if (options.bind_address == NULL) + return sock; +@@ -556,7 +586,7 @@ ssh_exchange_identification(int timeout_ms) + snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", + compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1, + compat20 ? PROTOCOL_MINOR_2 : minor1, +- SSH_VERSION, compat20 ? "\r\n" : "\n"); ++ SSH_RELEASE, compat20 ? "\r\n" : "\n"); + if (roaming_atomicio(vwrite, connection_out, buf, strlen(buf)) + != strlen(buf)) + fatal("write: %.100s", strerror(errno)); +diff --git a/sshconnect2.c b/sshconnect2.c +index c24b202..551ad20 100644 +--- a/sshconnect2.c ++++ b/sshconnect2.c +@@ -81,6 +81,12 @@ + extern char *client_version_string; + extern char *server_version_string; + extern Options options; ++extern Kex *xxx_kex; ++ ++/* tty_flag is set in ssh.c. use this in ssh_userauth2 */ ++/* if it is set then prevent the switch to the null cipher */ ++ ++extern int tty_flag; + + /* + * SSH2 key exchange +@@ -420,6 +426,28 @@ ssh_userauth2(const char *local_user, const char *server_user, char *host, + pubkey_cleanup(&authctxt); + dispatch_range(SSH2_MSG_USERAUTH_MIN, SSH2_MSG_USERAUTH_MAX, NULL); + ++ /* if the user wants to use the none cipher do it */ ++ /* post authentication and only if the right conditions are met */ ++ /* both of the NONE commands must be true and there must be no */ ++ /* tty allocated */ ++ if ((options.none_switch == 1) && (options.none_enabled == 1)) ++ { ++ if (!tty_flag) /* no null on tty sessions */ ++ { ++ debug("Requesting none rekeying..."); ++ myproposal[PROPOSAL_ENC_ALGS_STOC] = "none"; ++ myproposal[PROPOSAL_ENC_ALGS_CTOS] = "none"; ++ kex_prop2buf(&xxx_kex->my,myproposal); ++ packet_request_rekeying(); ++ fprintf(stderr, "WARNING: ENABLED NONE CIPHER\n"); ++ } ++ else ++ { ++ /* requested NONE cipher when in a tty */ ++ debug("Cannot switch to NONE cipher with tty allocated"); ++ fprintf(stderr, "NONE cipher switch disabled when a TTY is allocated\n"); ++ } ++ } + debug("Authentication succeeded (%s).", authctxt.method->name); + } + +diff --git a/sshd.c b/sshd.c +index cc10395..d873edb 100644 +--- a/sshd.c ++++ b/sshd.c +@@ -138,6 +138,9 @@ int deny_severity; + #define REEXEC_CONFIG_PASS_FD (STDERR_FILENO + 3) + #define REEXEC_MIN_FREE_FD (STDERR_FILENO + 4) + ++int myflag = 0; ++ ++ + extern char *__progname; + + /* Server configuration options. */ +@@ -419,7 +422,7 @@ sshd_exchange_identification(int sock_in, int sock_out) + minor = PROTOCOL_MINOR_1; + } + snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s%s", major, minor, +- SSH_VERSION, newline); ++ SSH_RELEASE, newline); + server_version_string = xstrdup(buf); + + /* Send our protocol version identification. */ +@@ -470,6 +473,9 @@ sshd_exchange_identification(int sock_in, int sock_out) + } + debug("Client protocol version %d.%d; client software version %.100s", + remote_major, remote_minor, remote_version); ++ logit("SSH: Server;Ltype: Version;Remote: %s-%d;Protocol: %d.%d;Client: %.100s", ++ get_remote_ipaddr(), get_remote_port(), ++ remote_major, remote_minor, remote_version); + + compat_datafellows(remote_version); + +@@ -1023,6 +1029,8 @@ server_listen(void) + int ret, listen_sock, on = 1; + struct addrinfo *ai; + char ntop[NI_MAXHOST], strport[NI_MAXSERV]; ++ int socksize; ++ int socksizelen = sizeof(int); + + for (ai = options.listen_addrs; ai; ai = ai->ai_next) { + if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6) +@@ -1063,6 +1071,11 @@ server_listen(void) + + debug("Bind to port %s on %s.", strport, ntop); + ++ getsockopt(listen_sock, SOL_SOCKET, SO_RCVBUF, ++ &socksize, &socksizelen); ++ debug("Server TCP RWIN socket size: %d", socksize); ++ debug("HPN Buffer Size: %d", options.hpn_buffer_size); ++ + /* Bind the socket to the desired port. */ + if (bind(listen_sock, ai->ai_addr, ai->ai_addrlen) < 0) { + error("Bind to port %s on %s failed: %.200s.", +@@ -1944,6 +1957,9 @@ main(int ac, char **av) + /* Log the connection. */ + verbose("Connection from %.500s port %d", remote_ip, remote_port); + ++ /* set the HPN options for the child */ ++ channel_set_hpn(options.hpn_disabled, options.hpn_buffer_size); ++ + /* + * We don't want to listen forever unless the other side + * successfully authenticates itself. So we set up an alarm which is +@@ -2300,9 +2316,15 @@ do_ssh2_kex(void) + { + Kex *kex; + ++ myflag++; ++ debug ("MYFLAG IS %d", myflag); + if (options.ciphers != NULL) { + myproposal[PROPOSAL_ENC_ALGS_CTOS] = + myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers; ++ } else if (options.none_enabled == 1) { ++ debug ("WARNING: None cipher enabled"); ++ myproposal[PROPOSAL_ENC_ALGS_CTOS] = ++ myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_ENCRYPT_INCLUDE_NONE; + } + myproposal[PROPOSAL_ENC_ALGS_CTOS] = + compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]); +diff --git a/sshd_config b/sshd_config +index 473e866..41bd4a3 100644 +--- a/sshd_config ++++ b/sshd_config +@@ -114,6 +114,20 @@ AuthorizedKeysFile .ssh/authorized_keys + # override default of no subsystems + Subsystem sftp /usr/libexec/sftp-server + ++# the following are HPN related configuration options ++# tcp receive buffer polling. disable in non autotuning kernels ++#TcpRcvBufPoll yes ++ ++# allow the use of the none cipher ++#NoneEnabled no ++ ++# disable hpn performance boosts ++#HPNDisabled no ++ ++# buffer size for hpn to non-hpn connections ++#HPNBufferSize 2048 ++ ++ + # Example of overriding settings on a per-user basis + #Match User anoncvs + # X11Forwarding no +diff --git a/version.h b/version.h +index 6a1acb3..a6a5b32 100644 +--- a/version.h ++++ b/version.h +@@ -3,4 +3,5 @@ + #define SSH_VERSION "OpenSSH_5.9" + + #define SSH_PORTABLE "p1" +-#define SSH_RELEASE SSH_VERSION SSH_PORTABLE ++#define SSH_HPN "-hpn13v11" ++#define SSH_RELEASE SSH_VERSION SSH_PORTABLE SSH_HPN +-- +1.7.7.3 + diff --git a/main/openssh/openssh5.9-peaktput.diff b/main/openssh/openssh5.9-peaktput.diff new file mode 100644 index 000000000..b376433d8 --- /dev/null +++ b/main/openssh/openssh5.9-peaktput.diff @@ -0,0 +1,75 @@ +From: Timo Teräs <timo.teras@iki.fi> +Date: Tue, 17 Jan 2012 07:45:35 +0000 +Subject: [PATCH 1/2] peakput + +--- + progressmeter.c | 19 ++++++++++++++++++- + 1 files changed, 18 insertions(+), 1 deletions(-) + +diff --git a/progressmeter.c b/progressmeter.c +index 0f95222..6b22511 100644 +--- a/progressmeter.c ++++ b/progressmeter.c +@@ -68,6 +68,8 @@ static time_t last_update; /* last progress update */ + static char *file; /* name of the file being transferred */ + static off_t end_pos; /* ending position of transfer */ + static off_t cur_pos; /* transfer position as of last refresh */ ++static off_t last_pos; ++static off_t max_delta_pos = 0; + static volatile off_t *counter; /* progress counter */ + static long stalled; /* how long we have been stalled */ + static int bytes_per_second; /* current speed in bytes per second */ +@@ -128,12 +130,17 @@ refresh_progress_meter(void) + int hours, minutes, seconds; + int i, len; + int file_len; ++ off_t delta_pos; + + transferred = *counter - cur_pos; + cur_pos = *counter; + now = time(NULL); + bytes_left = end_pos - cur_pos; + ++ delta_pos = cur_pos - last_pos; ++ if (delta_pos > max_delta_pos) ++ max_delta_pos = delta_pos; ++ + if (bytes_left > 0) + elapsed = now - last_update; + else { +@@ -158,7 +165,7 @@ refresh_progress_meter(void) + + /* filename */ + buf[0] = '\0'; +- file_len = win_size - 35; ++ file_len = win_size - 45; + if (file_len > 0) { + len = snprintf(buf, file_len + 1, "\r%s", file); + if (len < 0) +@@ -188,6 +195,15 @@ refresh_progress_meter(void) + (off_t)bytes_per_second); + strlcat(buf, "/s ", win_size); + ++ /* instantaneous rate */ ++ if (bytes_left > 0) ++ format_rate(buf + strlen(buf), win_size - strlen(buf), ++ delta_pos); ++ else ++ format_rate(buf + strlen(buf), win_size - strlen(buf), ++ max_delta_pos); ++ strlcat(buf, "/s ", win_size); ++ + /* ETA */ + if (!transferred) + stalled += elapsed; +@@ -224,6 +240,7 @@ refresh_progress_meter(void) + + atomicio(vwrite, STDOUT_FILENO, buf, win_size - 1); + last_update = now; ++ last_pos = cur_pos; + } + + /*ARGSUSED*/ +-- +1.7.8.3 + |