upstream: Set default IPQoS for interactive sessions to Expedited

Forwarding (EF)

Marking interactive session data with DSCP value EF (RFC3246, RFC3247)
helps inform the network on relative priority compared to other traffic.
This is especially useful for differentiated treatment over wireless media.

Following the reconciled IETF Diffserv to IEEE 802.11 mappings (RFC 8325),
traffic marked with DSCP value EF maps to User Priority 6 in QoS Control,
in turn mapping to the high priority WMM AC_VO access category.

OK djm@

OpenBSD-Commit-ID: aadda7b9da794d70d7c6b381a861a0610afce1b3

diff --git a/readconf.c b/readconf.c
index b5a9f925fc4ab8d79b3ac2a0b50565f0c33d8a8c..5e97d710e7cd00429fbdc63f60f93e8a175bf423 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.401 2025/07/23 05:07:19 djm Exp $ */
+/* $OpenBSD: readconf.c,v 1.402 2025/07/31 09:38:41 job Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2947,7 +2947,7 @@ 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_DSCP_EF;
        if (options->ip_qos_bulk == -1)
                options->ip_qos_bulk = IPTOS_DSCP_CS1;
        if (options->request_tty == -1)

diff --git a/servconf.c b/servconf.c
index 14165429f20f2733a78eeade11ffdf1253756df1..63176d0d0086108c63f3d9a96c6e78d562085352 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.427 2025/05/24 08:13:29 dtucker Exp $ */
+/* $OpenBSD: servconf.c,v 1.428 2025/07/31 09:38:41 job Exp $ */
 /*
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
@@ -472,7 +472,7 @@ 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_DSCP_EF;
        if (options->ip_qos_bulk == -1)
                options->ip_qos_bulk = IPTOS_DSCP_CS1;
        if (options->version_addendum == NULL)

diff --git a/ssh_config.5 b/ssh_config.5
index 14115fff1e1eff63b800390798b8e52992df079b..4b5b62408f159bf6f3623c23d9b3f3640ac159fb 100644 (file)
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: ssh_config.5,v 1.414 2025/07/23 05:07:19 djm Exp $
-.Dd $Mdocdate: July 23 2025 $
+.\" $OpenBSD: ssh_config.5,v 1.415 2025/07/31 09:38:41 job Exp $
+.Dd $Mdocdate: July 31 2025 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -1277,8 +1277,8 @@ 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 ef
+(Expedited Forwarding)
 for interactive sessions and
 .Cm cs1
 (Lower Effort)

diff --git a/sshd_config.5 b/sshd_config.5
index c07717375d90c2a01c2c2cebedac8cc272c3caa8..ae57d0cb9c863f4593434e2dfb630acab4837b5a 100644 (file)
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -33,8 +33,8 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $OpenBSD: sshd_config.5,v 1.381 2025/02/15 01:52:07 djm Exp $
-.Dd $Mdocdate: February 15 2025 $
+.\" $OpenBSD: sshd_config.5,v 1.382 2025/07/31 09:38:41 job Exp $
+.Dd $Mdocdate: July 31 2025 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -958,8 +958,8 @@ 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 ef
+(Expedited Forwarding)
 for interactive sessions and
 .Cm cs1
 (Lower Effort)