summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--channels.h6
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3a7a497a2..602d8ad6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120070612
2 - (dtucker) OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2007/06/11 09:14:00
4 [channels.h]
5 increase default channel windows; ok djm
6
120070611 720070611
2 - (djm) Bugzilla #1306: silence spurious error messages from hang-on-exit 8 - (djm) Bugzilla #1306: silence spurious error messages from hang-on-exit
3 fix; tested by dtucker@ and jochen.kirn AT gmail.com 9 fix; tested by dtucker@ and jochen.kirn AT gmail.com
@@ -3011,4 +3017,4 @@
3011 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3017 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3012 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3018 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3013 3019
3014$Id: ChangeLog,v 1.4688 2007/06/11 08:33:15 djm Exp $ 3020$Id: ChangeLog,v 1.4689 2007/06/12 13:38:53 dtucker Exp $
diff --git a/channels.h b/channels.h
index 2674f096e..b632a86af 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: channels.h,v 1.88 2006/08/03 03:34:42 deraadt Exp $ */ 1/* $OpenBSD: channels.h,v 1.89 2007/06/11 09:14:00 markus Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -122,9 +122,9 @@ struct Channel {
122 122
123/* default window/packet sizes for tcp/x11-fwd-channel */ 123/* default window/packet sizes for tcp/x11-fwd-channel */
124#define CHAN_SES_PACKET_DEFAULT (32*1024) 124#define CHAN_SES_PACKET_DEFAULT (32*1024)
125#define CHAN_SES_WINDOW_DEFAULT (4*CHAN_SES_PACKET_DEFAULT) 125#define CHAN_SES_WINDOW_DEFAULT (64*CHAN_SES_PACKET_DEFAULT)
126#define CHAN_TCP_PACKET_DEFAULT (32*1024) 126#define CHAN_TCP_PACKET_DEFAULT (32*1024)
127#define CHAN_TCP_WINDOW_DEFAULT (4*CHAN_TCP_PACKET_DEFAULT) 127#define CHAN_TCP_WINDOW_DEFAULT (64*CHAN_TCP_PACKET_DEFAULT)
128#define CHAN_X11_PACKET_DEFAULT (16*1024) 128#define CHAN_X11_PACKET_DEFAULT (16*1024)
129#define CHAN_X11_WINDOW_DEFAULT (4*CHAN_X11_PACKET_DEFAULT) 129#define CHAN_X11_WINDOW_DEFAULT (4*CHAN_X11_PACKET_DEFAULT)
130 130