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 /session.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 'session.c')
-rw-r--r-- | session.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: session.c,v 1.256 2010/06/25 07:20:04 djm Exp $ */ | 1 | /* $OpenBSD: session.c,v 1.257 2010/11/13 23:27:50 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -585,7 +585,8 @@ do_exec_no_pty(Session *s, const char *command) | |||
585 | 585 | ||
586 | s->pid = pid; | 586 | s->pid = pid; |
587 | /* Set interactive/non-interactive mode. */ | 587 | /* Set interactive/non-interactive mode. */ |
588 | packet_set_interactive(s->display != NULL); | 588 | packet_set_interactive(s->display != NULL, |
589 | options.ip_qos_interactive, options.ip_qos_bulk); | ||
589 | 590 | ||
590 | /* | 591 | /* |
591 | * Clear loginmsg, since it's the child's responsibility to display | 592 | * Clear loginmsg, since it's the child's responsibility to display |
@@ -739,7 +740,8 @@ do_exec_pty(Session *s, const char *command) | |||
739 | 740 | ||
740 | /* Enter interactive session. */ | 741 | /* Enter interactive session. */ |
741 | s->ptymaster = ptymaster; | 742 | s->ptymaster = ptymaster; |
742 | packet_set_interactive(1); | 743 | packet_set_interactive(1, |
744 | options.ip_qos_interactive, options.ip_qos_bulk); | ||
743 | if (compat20) { | 745 | if (compat20) { |
744 | session_set_fds(s, ptyfd, fdout, -1, 1, 1); | 746 | session_set_fds(s, ptyfd, fdout, -1, 1, 1); |
745 | } else { | 747 | } else { |