tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

Allow IPQoS=none in ssh/sshd to not set an explicit
ToS/DSCP value and just use the operating system default; ok dtucker@

Upstream-ID: 77906ff8c7b660b02ba7cb1e47b17d66f54f1f7e
This commit is contained in:
djm@openbsd.org 2017-07-23 23:37:02 +00:00 committed by Damien Miller
parent 6c1fbd5a50
commit 51676ec614
4 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
misc.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: misc.c,v 1.110 2017/05/31 09:15:42 deraadt Exp $ */ /* $OpenBSD: misc.c,v 1.111 2017/07/23 23:37:02 djm Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2005,2006 Damien Miller. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@ -1085,6 +1085,7 @@ static const struct {
const char *name; const char *name;
int value; int value;
} ipqos[] = { } ipqos[] = {
{ "none", INT_MAX }, /* can't use 0 here; that's CS0 */
{ "af11", IPTOS_DSCP_AF11 }, { "af11", IPTOS_DSCP_AF11 },
{ "af12", IPTOS_DSCP_AF12 }, { "af12", IPTOS_DSCP_AF12 },
{ "af13", IPTOS_DSCP_AF13 }, { "af13", IPTOS_DSCP_AF13 },

4
packet.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: packet.c,v 1.262 2017/06/24 06:38:11 djm Exp $ */ /* $OpenBSD: packet.c,v 1.263 2017/07/23 23:37:02 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1997,7 +1997,7 @@ void
ssh_packet_set_tos(struct ssh *ssh, int tos) ssh_packet_set_tos(struct ssh *ssh, int tos)
{ {
#ifndef IP_TOS_IS_BROKEN #ifndef IP_TOS_IS_BROKEN
if (!ssh_packet_connection_is_on_socket(ssh)) if (!ssh_packet_connection_is_on_socket(ssh) || tos == INT_MAX)
return; return;
switch (ssh_packet_connection_af(ssh)) { switch (ssh_packet_connection_af(ssh)) {
# ifdef IP_TOS # ifdef IP_TOS

8
ssh_config.5
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh_config.5,v 1.252 2017/07/13 19:16:33 jmc Exp $ .\" $OpenBSD: ssh_config.5,v 1.253 2017/07/23 23:37:02 djm Exp $
.Dd $Mdocdate: July 13 2017 $ .Dd $Mdocdate: July 23 2017 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -969,7 +969,9 @@ Accepted values are
.Cm lowdelay , .Cm lowdelay ,
.Cm throughput , .Cm throughput ,
.Cm reliability , .Cm reliability ,
or a numeric value. a numeric value, or
.Cm none
to use the operating system default.
This option may take one or two arguments, separated by whitespace. This option may take one or two arguments, separated by whitespace.
If one argument is specified, it is used as the packet class unconditionally. If one argument is specified, it is used as the packet class unconditionally.
If two values are specified, the first is automatically selected for If two values are specified, the first is automatically selected for

8
sshd_config.5
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd_config.5,v 1.249 2017/07/13 19:16:33 jmc Exp $ .\" $OpenBSD: sshd_config.5,v 1.250 2017/07/23 23:37:02 djm Exp $
.Dd $Mdocdate: July 13 2017 $ .Dd $Mdocdate: July 23 2017 $
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -792,7 +792,9 @@ Accepted values are
.Cm lowdelay , .Cm lowdelay ,
.Cm throughput , .Cm throughput ,
.Cm reliability , .Cm reliability ,
or a numeric value. a numeric value, or
.Cm none
to use the operating system default.
This option may take one or two arguments, separated by whitespace. This option may take one or two arguments, separated by whitespace.
If one argument is specified, it is used as the packet class unconditionally. If one argument is specified, it is used as the packet class unconditionally.
If two values are specified, the first is automatically selected for If two values are specified, the first is automatically selected for