summaryrefslogtreecommitdiffstats
path: root/crypto/openssh/channels.h
diff options
context:
space:
mode:
authored <ed@FreeBSD.org>2012-02-13 11:59:59 +0000
committered <ed@FreeBSD.org>2012-02-13 11:59:59 +0000
commitb36b72f1543152663134dbccfa40dac46c847910 (patch)
tree690ce6398942be25f1ff4d5bec5108f80bab3674 /crypto/openssh/channels.h
parenta06d0248d26b0c6b6a8db5611ade3a93483295f3 (diff)
downloadFreeBSD-src-b36b72f1543152663134dbccfa40dac46c847910.zip
FreeBSD-src-b36b72f1543152663134dbccfa40dac46c847910.tar.gz
Polish diff against upstream.
- Revert unneeded whitespace changes. - Revert modifications to loginrec.c, as the upstream version already does the right thing. - Fix indentation and whitespace of local changes. Approved by: des MFC after: 1 month
Diffstat (limited to 'crypto/openssh/channels.h')
-rw-r--r--crypto/openssh/channels.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/crypto/openssh/channels.h b/crypto/openssh/channels.h
index 6ee993a..c469720 100644
--- a/crypto/openssh/channels.h
+++ b/crypto/openssh/channels.h
@@ -126,7 +126,7 @@ struct Channel {
u_int local_window_max;
u_int local_consumed;
u_int local_maxpacket;
- u_int tcpwinsz;
+ u_int tcpwinsz;
int dynamic_window;
int extended_usage;
int single_connection;
@@ -165,13 +165,10 @@ 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_TCP_PACKET_DEFAULT (32*1024)
#define CHAN_TCP_WINDOW_DEFAULT (64*CHAN_TCP_PACKET_DEFAULT)
-
#define CHAN_X11_PACKET_DEFAULT (16*1024)
#define CHAN_X11_WINDOW_DEFAULT (4*CHAN_X11_PACKET_DEFAULT)
-
#define CHAN_HPN_MIN_WINDOW_DEFAULT (2*1024*1024)
/* possible input states */
@@ -302,6 +299,7 @@ void chan_write_failed(Channel *);
void chan_obuf_empty(Channel *);
/* hpn handler */
-void channel_set_hpn(int, u_int);
+
+void channel_set_hpn(int, u_int);
#endif
OpenPOWER on IntegriCloud