openkylin
/
openssh
mirror of https://gitee.com/openkylin/openssh.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "upstream: Update default IPQoS in ssh(1), sshd(8) to DSCP AF21 for" 

This reverts commit 5ee8448ad7c306f05a9f56769f95336a8269f379.

The IPQoS default changes have some unfortunate interactions with
iptables (see https://bugs.debian.org/923880) and VMware, so I'm
temporarily reverting them until those have been fixed.

Bug-Debian: https://bugs.debian.org/923879
Bug-Debian: https://bugs.debian.org/926229
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1822370
Last-Update: 2019-04-08

Patch-Name: revert-ipqos-defaults.patch

Gbp-Pq: Name revert-ipqos-defaults.patch
This commit is contained in:
Colin Watson 2019-04-08 10:46:29 +01:00 committed by lixiuwen
parent 45c41b851c
commit d194c5bf3b
4 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
readconf.c
View File

@ -2852,9 +2852,9 @@ fill_default_options(Options * options)
if (options->visual_host_key == -1) if (options->visual_host_key == -1)
options->visual_host_key = 0; options->visual_host_key = 0;
if (options->ip_qos_interactive == -1) 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) if (options->ip_qos_bulk == -1)
options->ip_qos_bulk = IPTOS_DSCP_CS1; options->ip_qos_bulk = IPTOS_THROUGHPUT;
if (options->request_tty == -1) if (options->request_tty == -1)
options->request_tty = REQUEST_TTY_AUTO; options->request_tty = REQUEST_TTY_AUTO;
if (options->session_type == -1) if (options->session_type == -1)

4
servconf.c
View File

@ -439,9 +439,9 @@ fill_default_server_options(ServerOptions *options)
if (options->permit_tun == -1) if (options->permit_tun == -1)
options->permit_tun = SSH_TUNMODE_NO; options->permit_tun = SSH_TUNMODE_NO;
if (options->ip_qos_interactive == -1) 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) if (options->ip_qos_bulk == -1)
options->ip_qos_bulk = IPTOS_DSCP_CS1; options->ip_qos_bulk = IPTOS_THROUGHPUT;
if (options->version_addendum == NULL) if (options->version_addendum == NULL)
options->version_addendum = xstrdup(""); options->version_addendum = xstrdup("");
if (options->fwd_opts.streamlocal_bind_mask == (mode_t)-1) if (options->fwd_opts.streamlocal_bind_mask == (mode_t)-1)

6
ssh_config.5
View File

@ -1313,11 +1313,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 If two values are specified, the first is automatically selected for
interactive sessions and the second for non-interactive sessions. interactive sessions and the second for non-interactive sessions.
The default is The default is
.Cm af21 .Cm lowdelay
(Low-Latency Data)
for interactive sessions and for interactive sessions and
.Cm cs1 .Cm throughput
(Lower Effort)
for non-interactive sessions. for non-interactive sessions.
.It Cm KbdInteractiveAuthentication .It Cm KbdInteractiveAuthentication
Specifies whether to use keyboard-interactive authentication. Specifies whether to use keyboard-interactive authentication.

6
sshd_config.5
View File

@ -1014,11 +1014,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 If two values are specified, the first is automatically selected for
interactive sessions and the second for non-interactive sessions. interactive sessions and the second for non-interactive sessions.
The default is The default is
.Cm af21 .Cm lowdelay
(Low-Latency Data)
for interactive sessions and for interactive sessions and
.Cm cs1 .Cm throughput
(Lower Effort)
for non-interactive sessions. for non-interactive sessions.
.It Cm KbdInteractiveAuthentication .It Cm KbdInteractiveAuthentication
Specifies whether to allow keyboard-interactive authentication. Specifies whether to allow keyboard-interactive authentication.