diff options
author | Damien Miller <djm@mindrot.org> | 2010-11-20 15:19:38 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-11-20 15:19:38 +1100 |
commit | 0dac6fb6b228a96f4ab3717e3d73871595a291a8 (patch) | |
tree | 7eae6f1e6a39fb7d608a05250f4749a77a914814 /clientloop.c | |
parent | 4499f4cc20eee7e0f67b35f5a5c6078bf07dcbc0 (diff) |
- djm@cvs.openbsd.org 2010/11/13 23:27:51
[clientloop.c misc.c misc.h packet.c packet.h readconf.c readconf.h]
[servconf.c servconf.h session.c ssh.c ssh_config.5 sshd_config.5]
allow ssh and sshd to set arbitrary TOS/DSCP/QoS values instead of
hardcoding lowdelay/throughput.
bz#1733 patch from philipp AT redfish-solutions.com; ok markus@ deraadt@
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/clientloop.c b/clientloop.c index 848aacd4a..52dcb4c04 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.223 2010/10/06 06:39:28 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.224 2010/11/13 23:27:50 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -1973,6 +1973,9 @@ client_session2_setup(int id, int want_tty, int want_subsystem, | |||
1973 | if ((c = channel_lookup(id)) == NULL) | 1973 | if ((c = channel_lookup(id)) == NULL) |
1974 | fatal("client_session2_setup: channel %d: unknown channel", id); | 1974 | fatal("client_session2_setup: channel %d: unknown channel", id); |
1975 | 1975 | ||
1976 | packet_set_interactive(want_tty, | ||
1977 | options.ip_qos_interactive, options.ip_qos_bulk); | ||
1978 | |||
1976 | if (want_tty) { | 1979 | if (want_tty) { |
1977 | struct winsize ws; | 1980 | struct winsize ws; |
1978 | 1981 | ||