File openssh-7.9p1-revert-new-qos-defaults.patch of Package openssh.29884

From a4c5f99fe57390b5a80e914817df92f4fadaf4a5 Mon Sep 17 00:00:00 2001
From: Hans Petter Jansson <hpj@cl.no>
Date: Thu, 20 Jun 2019 23:54:11 +0200
Subject: [PATCH] Revert IPQoS DSCP AF21/CS1 from upstream due to bugs in other
 software

Reverts OpenBSD-Commit-ID: d11d2a4484f461524ef0c20870523dfcdeb52181
---
 readconf.c    | 4 ++--
 servconf.c    | 4 ++--
 ssh_config.5  | 6 ++----
 sshd_config.5 | 6 ++----
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/readconf.c b/readconf.c
index 97f48bb..49bffc9 100644
--- a/readconf.c
+++ b/readconf.c
@@ -2142,9 +2142,9 @@ fill_default_options(Options * options)
 	if (options->visual_host_key == -1)
 		options->visual_host_key = 0;
 	if (options->ip_qos_interactive == -1)
-		options->ip_qos_interactive = IPTOS_DSCP_AF21;
+		options->ip_qos_interactive = IPTOS_LOWDELAY;
 	if (options->ip_qos_bulk == -1)
-		options->ip_qos_bulk = IPTOS_DSCP_CS1;
+		options->ip_qos_bulk = IPTOS_THROUGHPUT;
 	if (options->request_tty == -1)
 		options->request_tty = REQUEST_TTY_AUTO;
 	if (options->proxy_use_fdpass == -1)
diff --git a/servconf.c b/servconf.c
index 31543e6..c04d910 100644
--- a/servconf.c
+++ b/servconf.c
@@ -425,9 +425,9 @@ fill_default_server_options(ServerOptions *options)
 	if (options->permit_tun == -1)
 		options->permit_tun = SSH_TUNMODE_NO;
 	if (options->ip_qos_interactive == -1)
-		options->ip_qos_interactive = IPTOS_DSCP_AF21;
+		options->ip_qos_interactive = IPTOS_LOWDELAY;
 	if (options->ip_qos_bulk == -1)
-		options->ip_qos_bulk = IPTOS_DSCP_CS1;
+		options->ip_qos_bulk = IPTOS_THROUGHPUT;
 	if (options->version_addendum == NULL)
 		options->version_addendum = xstrdup("");
 	if (options->fwd_opts.streamlocal_bind_mask == (mode_t)-1)
diff --git a/ssh_config.5 b/ssh_config.5
index 36e3ba5..d0adf60 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -1031,11 +1031,9 @@ If one argument is specified, it is used as the packet class unconditionally.
 If two values are specified, the first is automatically selected for
 interactive sessions and the second for non-interactive sessions.
 The default is
-.Cm af21
-(Low-Latency Data)
+.Cm lowdelay
 for interactive sessions and
-.Cm cs1
-(Lower Effort)
+.Cm throughput
 for non-interactive sessions.
 .It Cm KbdInteractiveAuthentication
 Specifies whether to use keyboard-interactive authentication.
diff --git a/sshd_config.5 b/sshd_config.5
index 0f1a7cd..3b875d2 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -842,11 +842,9 @@ If one argument is specified, it is used as the packet class unconditionally.
 If two values are specified, the first is automatically selected for
 interactive sessions and the second for non-interactive sessions.
 The default is
-.Cm af21
-(Low-Latency Data)
+.Cm lowdelay
 for interactive sessions and
-.Cm cs1
-(Lower Effort)
+.Cm throughput
 for non-interactive sessions.
 .It Cm KbdInteractiveAuthentication
 Specifies whether to allow keyboard-interactive authentication.
-- 
2.21.0