diff options
-rw-r--r-- | misc.c | 3 | ||||
-rw-r--r-- | packet.c | 4 | ||||
-rw-r--r-- | ssh_config.5 | 8 | ||||
-rw-r--r-- | sshd_config.5 | 8 |
4 files changed, 14 insertions, 9 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: misc.c,v 1.110 2017/05/31 09:15:42 deraadt Exp $ */ | 1 | /* $OpenBSD: misc.c,v 1.111 2017/07/23 23:37:02 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2005,2006 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2005,2006 Damien Miller. All rights reserved. |
@@ -1085,6 +1085,7 @@ static const struct { | |||
1085 | const char *name; | 1085 | const char *name; |
1086 | int value; | 1086 | int value; |
1087 | } ipqos[] = { | 1087 | } ipqos[] = { |
1088 | { "none", INT_MAX }, /* can't use 0 here; that's CS0 */ | ||
1088 | { "af11", IPTOS_DSCP_AF11 }, | 1089 | { "af11", IPTOS_DSCP_AF11 }, |
1089 | { "af12", IPTOS_DSCP_AF12 }, | 1090 | { "af12", IPTOS_DSCP_AF12 }, |
1090 | { "af13", IPTOS_DSCP_AF13 }, | 1091 | { "af13", IPTOS_DSCP_AF13 }, |
@@ -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 |
diff --git a/ssh_config.5 b/ssh_config.5 index 89da9b53a..15ca0b4f9 100644 --- a/ssh_config.5 +++ b/ssh_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: ssh_config.5,v 1.252 2017/07/13 19:16:33 jmc Exp $ | 36 | .\" $OpenBSD: ssh_config.5,v 1.253 2017/07/23 23:37:02 djm Exp $ |
37 | .Dd $Mdocdate: July 13 2017 $ | 37 | .Dd $Mdocdate: July 23 2017 $ |
38 | .Dt SSH_CONFIG 5 | 38 | .Dt SSH_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -969,7 +969,9 @@ Accepted values are | |||
969 | .Cm lowdelay , | 969 | .Cm lowdelay , |
970 | .Cm throughput , | 970 | .Cm throughput , |
971 | .Cm reliability , | 971 | .Cm reliability , |
972 | or a numeric value. | 972 | a numeric value, or |
973 | .Cm none | ||
974 | to use the operating system default. | ||
973 | This option may take one or two arguments, separated by whitespace. | 975 | This option may take one or two arguments, separated by whitespace. |
974 | If one argument is specified, it is used as the packet class unconditionally. | 976 | If one argument is specified, it is used as the packet class unconditionally. |
975 | If two values are specified, the first is automatically selected for | 977 | If two values are specified, the first is automatically selected for |
diff --git a/sshd_config.5 b/sshd_config.5 index 6a77c9343..76e157f2e 100644 --- a/sshd_config.5 +++ b/sshd_config.5 | |||
@@ -33,8 +33,8 @@ | |||
33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | 33 | .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 34 | .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
35 | .\" | 35 | .\" |
36 | .\" $OpenBSD: sshd_config.5,v 1.249 2017/07/13 19:16:33 jmc Exp $ | 36 | .\" $OpenBSD: sshd_config.5,v 1.250 2017/07/23 23:37:02 djm Exp $ |
37 | .Dd $Mdocdate: July 13 2017 $ | 37 | .Dd $Mdocdate: July 23 2017 $ |
38 | .Dt SSHD_CONFIG 5 | 38 | .Dt SSHD_CONFIG 5 |
39 | .Os | 39 | .Os |
40 | .Sh NAME | 40 | .Sh NAME |
@@ -792,7 +792,9 @@ Accepted values are | |||
792 | .Cm lowdelay , | 792 | .Cm lowdelay , |
793 | .Cm throughput , | 793 | .Cm throughput , |
794 | .Cm reliability , | 794 | .Cm reliability , |
795 | or a numeric value. | 795 | a numeric value, or |
796 | .Cm none | ||
797 | to use the operating system default. | ||
796 | This option may take one or two arguments, separated by whitespace. | 798 | This option may take one or two arguments, separated by whitespace. |
797 | If one argument is specified, it is used as the packet class unconditionally. | 799 | If one argument is specified, it is used as the packet class unconditionally. |
798 | If two values are specified, the first is automatically selected for | 800 | If two values are specified, the first is automatically selected for |