Attachment 1995 Details for Bug 1856 – Fix IPTOS_CLASS_CSx naming and change default values to something not obsolete

[patch] Fix IPTOS_CLASS_CSx naming and change default values to something not obsolete

openssh-class.patch (text/plain), 5.85 KB, created by Philip Prindeville on 2011-02-10 10:47:37 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Philip Prindeville

Created: 2011-02-10 10:47:37 AEDT

Size: 5.85 KB

patch

obsolete

>? .cvssource
>Index: defines.h
>===================================================================
>RCS file: /cvs/openssh/defines.h,v
>retrieving revision 1.164
>diff -u -p -r1.164 defines.h
>--- defines.h	17 Jan 2011 10:15:31 -0000	1.164
>+++ defines.h	9 Feb 2011 23:44:37 -0000
>@@ -73,16 +73,16 @@ enum
> # define	IPTOS_DSCP_AF43		0x98
> # define	IPTOS_DSCP_EF		0xb8
> #endif /* IPTOS_DSCP_AF11 */
>-#ifndef IPTOS_DSCP_CS0
>-# define	IPTOS_DSCP_CS0		0x00
>-# define	IPTOS_DSCP_CS1		0x20
>-# define	IPTOS_DSCP_CS2		0x40
>-# define	IPTOS_DSCP_CS3		0x60
>-# define	IPTOS_DSCP_CS4		0x80
>-# define	IPTOS_DSCP_CS5		0xa0
>-# define	IPTOS_DSCP_CS6		0xc0
>-# define	IPTOS_DSCP_CS7		0xe0
>-#endif /* IPTOS_DSCP_CS0 */
>+#ifndef IPTOS_CLASS_CS0
>+# define	IPTOS_CLASS_CS0		0x00
>+# define	IPTOS_CLASS_CS1		0x20
>+# define	IPTOS_CLASS_CS2		0x40
>+# define	IPTOS_CLASS_CS3		0x60
>+# define	IPTOS_CLASS_CS4		0x80
>+# define	IPTOS_CLASS_CS5		0xa0
>+# define	IPTOS_CLASS_CS6		0xc0
>+# define	IPTOS_CLASS_CS7		0xe0
>+#endif /* IPTOS_CLASS_CS0 */
> #ifndef IPTOS_DSCP_EF
> # define	IPTOS_DSCP_EF		0xb8
> #endif /* IPTOS_DSCP_EF */
>Index: misc.c
>===================================================================
>RCS file: /cvs/openssh/misc.c,v
>retrieving revision 1.109
>diff -u -p -r1.109 misc.c
>--- misc.c	13 Jan 2011 01:21:36 -0000	1.109
>+++ misc.c	9 Feb 2011 23:44:37 -0000
>@@ -950,14 +950,14 @@ static const struct {
> 	{ "af41", IPTOS_DSCP_AF41 },
> 	{ "af42", IPTOS_DSCP_AF42 },
> 	{ "af43", IPTOS_DSCP_AF43 },
>-	{ "cs0", IPTOS_DSCP_CS0 },
>-	{ "cs1", IPTOS_DSCP_CS1 },
>-	{ "cs2", IPTOS_DSCP_CS2 },
>-	{ "cs3", IPTOS_DSCP_CS3 },
>-	{ "cs4", IPTOS_DSCP_CS4 },
>-	{ "cs5", IPTOS_DSCP_CS5 },
>-	{ "cs6", IPTOS_DSCP_CS6 },
>-	{ "cs7", IPTOS_DSCP_CS7 },
>+	{ "cs0", IPTOS_CLASS_CS0 },
>+	{ "cs1", IPTOS_CLASS_CS1 },
>+	{ "cs2", IPTOS_CLASS_CS2 },
>+	{ "cs3", IPTOS_CLASS_CS3 },
>+	{ "cs4", IPTOS_CLASS_CS4 },
>+	{ "cs5", IPTOS_CLASS_CS5 },
>+	{ "cs6", IPTOS_CLASS_CS6 },
>+	{ "cs7", IPTOS_CLASS_CS7 },
> 	{ "ef", IPTOS_DSCP_EF },
> 	{ "lowdelay", IPTOS_LOWDELAY },
> 	{ "throughput", IPTOS_THROUGHPUT },
>Index: readconf.c
>===================================================================
>RCS file: /cvs/openssh/readconf.c,v
>retrieving revision 1.170
>diff -u -p -r1.170 readconf.c
>--- readconf.c	20 Nov 2010 04:19:38 -0000	1.170
>+++ readconf.c	9 Feb 2011 23:44:38 -0000
>@@ -1312,9 +1312,9 @@ fill_default_options(Options * options)
> 	if (options->zero_knowledge_password_authentication == -1)
> 		options->zero_knowledge_password_authentication = 0;
> 	if (options->ip_qos_interactive == -1)
>-		options->ip_qos_interactive = IPTOS_LOWDELAY;
>+		options->ip_qos_interactive = IPTOS_DSCP_AF21;
> 	if (options->ip_qos_bulk == -1)
>-		options->ip_qos_bulk = IPTOS_THROUGHPUT;
>+		options->ip_qos_bulk = IPTOS_DSCP_AF11;
> 	/* options->local_command should not be set by default */
> 	/* options->proxy_command should not be set by default */
> 	/* options->user will be set in the main program if appropriate */
>Index: servconf.c
>===================================================================
>RCS file: /cvs/openssh/servconf.c,v
>retrieving revision 1.209
>diff -u -p -r1.209 servconf.c
>--- servconf.c	20 Nov 2010 04:19:38 -0000	1.209
>+++ servconf.c	9 Feb 2011 23:44:41 -0000
>@@ -278,9 +278,9 @@ fill_default_server_options(ServerOption
> 	if (options->zero_knowledge_password_authentication == -1)
> 		options->zero_knowledge_password_authentication = 0;
> 	if (options->ip_qos_interactive == -1)
>-		options->ip_qos_interactive = IPTOS_LOWDELAY;
>+		options->ip_qos_interactive = IPTOS_DSCP_AF21;
> 	if (options->ip_qos_bulk == -1)
>-		options->ip_qos_bulk = IPTOS_THROUGHPUT;
>+		options->ip_qos_bulk = IPTOS_DSCP_AF11;
> 
> 	/* Turn privilege separation on by default */
> 	if (use_privsep == -1)
>Index: ssh_config
>===================================================================
>RCS file: /cvs/openssh/ssh_config,v
>retrieving revision 1.28
>diff -u -p -r1.28 ssh_config
>--- ssh_config	12 Jan 2010 08:40:27 -0000	1.28
>+++ ssh_config	9 Feb 2011 23:44:41 -0000
>@@ -45,3 +45,4 @@
> #   PermitLocalCommand no
> #   VisualHostKey no
> #   ProxyCommand ssh -q -W %h:%p gateway.example.com
>+#   IPQoS AF21 AF11
>Index: ssh_config.5
>===================================================================
>RCS file: /cvs/openssh/ssh_config.5,v
>retrieving revision 1.146
>diff -u -p -r1.146 ssh_config.5
>--- ssh_config.5	26 Dec 2010 03:26:48 -0000	1.146
>+++ ssh_config.5	9 Feb 2011 23:44:42 -0000
>@@ -662,9 +662,9 @@ If one argument is specified, it is used
> If two values are specified, the first is automatically selected for
> interactive sessions and the second for non-interactive sessions.
> The default is
>-.Dq lowdelay
>+.Dq af21
> for interactive sessions and
>-.Dq throughput
>+.Dq af11
> for non-interactive sessions.
> .It Cm KbdInteractiveAuthentication
> Specifies whether to use keyboard-interactive authentication.
>Index: sshd_config
>===================================================================
>RCS file: /cvs/openssh/sshd_config,v
>retrieving revision 1.84
>diff -u -p -r1.84 sshd_config
>--- sshd_config	10 Sep 2010 01:20:12 -0000	1.84
>+++ sshd_config	9 Feb 2011 23:44:42 -0000
>@@ -108,6 +108,9 @@
> # no default banner path
> #Banner none
> 
>+# operate in DSCP (RFC-4594) environment
>+#IPQoS AF21 AF11
>+
> # override default of no subsystems
> Subsystem	sftp	/usr/libexec/sftp-server
> 
>Index: sshd_config.5
>===================================================================
>RCS file: /cvs/openssh/sshd_config.5,v
>retrieving revision 1.138
>diff -u -p -r1.138 sshd_config.5
>--- sshd_config.5	26 Dec 2010 03:26:48 -0000	1.138
>+++ sshd_config.5	9 Feb 2011 23:44:43 -0000
>@@ -545,9 +545,9 @@ If one argument is specified, it is used
> If two values are specified, the first is automatically selected for
> interactive sessions and the second for non-interactive sessions.
> The default is
>-.Dq lowdelay
>+.Dq af21
> for interactive sessions and
>-.Dq throughput
>+.Dq af11
> for non-interactive sessions.
> .It Cm KerberosAuthentication
> Specifies whether the password provided by the user for

Actions: View | Diff

Attachments on bug 1856: 1995 | 1998