diff options
author | djm@openbsd.org <djm@openbsd.org> | 2017-07-23 23:37:02 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-07-24 14:48:47 +1000 |
commit | 51676ec61491ec6d7cbd06082034e29b377b3bf6 (patch) | |
tree | 60fb899d14e5a843a730db1665024c2784cca5e3 /packet.c | |
parent | 6c1fbd5a50d8d2415f06c920dd3b1279b741072d (diff) |
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
Diffstat (limited to 'packet.c')
-rw-r--r-- | packet.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: packet.c,v 1.262 2017/06/24 06:38:11 djm Exp $ */ | 1 | /* $OpenBSD: packet.c,v 1.263 2017/07/23 23:37:02 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 |
@@ -1997,7 +1997,7 @@ void | |||
1997 | ssh_packet_set_tos(struct ssh *ssh, int tos) | 1997 | ssh_packet_set_tos(struct ssh *ssh, int tos) |
1998 | { | 1998 | { |
1999 | #ifndef IP_TOS_IS_BROKEN | 1999 | #ifndef IP_TOS_IS_BROKEN |
2000 | if (!ssh_packet_connection_is_on_socket(ssh)) | 2000 | if (!ssh_packet_connection_is_on_socket(ssh) || tos == INT_MAX) |
2001 | return; | 2001 | return; |
2002 | switch (ssh_packet_connection_af(ssh)) { | 2002 | switch (ssh_packet_connection_af(ssh)) { |
2003 | # ifdef IP_TOS | 2003 | # ifdef IP_TOS |