Attachment #1995 for bug #1856




# define	IPTOS_DSCP_AF43		0x98
# define	IPTOS_DSCP_EF		0xb8
#endif /* IPTOS_DSCP_AF11 */
#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 */




	{ "af41", IPTOS_DSCP_AF41 },
	{ "af42", IPTOS_DSCP_AF42 },
	{ "af43", IPTOS_DSCP_AF43 },
	{ "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 },

Lines 1312-1320 fill_default_options(Options * options) Link Here

(-)readconf.c (-2 / +2 lines)
1312	if (options->zero_knowledge_password_authentication == -1)	1312	if (options->zero_knowledge_password_authentication == -1)
1313	options->zero_knowledge_password_authentication = 0;	1313	options->zero_knowledge_password_authentication = 0;
1314	if (options->ip_qos_interactive == -1)	1314	if (options->ip_qos_interactive == -1)
1315	options->ip_qos_interactive = IPTOS_LOWDELAY;	1315	options->ip_qos_interactive = IPTOS_DSCP_AF21;
1316	if (options->ip_qos_bulk == -1)	1316	if (options->ip_qos_bulk == -1)
1317	options->ip_qos_bulk = IPTOS_THROUGHPUT;	1317	options->ip_qos_bulk = IPTOS_DSCP_AF11;
1318	/* options->local_command should not be set by default */	1318	/* options->local_command should not be set by default */
1319	/* options->proxy_command should not be set by default */	1319	/* options->proxy_command should not be set by default */
1320	/* options->user will be set in the main program if appropriate */	1320	/* options->user will be set in the main program if appropriate */

Lines 278-286 fill_default_server_options(ServerOption Link Here

(-)servconf.c (-2 / +2 lines)
278	if (options->zero_knowledge_password_authentication == -1)	278	if (options->zero_knowledge_password_authentication == -1)
279	options->zero_knowledge_password_authentication = 0;	279	options->zero_knowledge_password_authentication = 0;
280	if (options->ip_qos_interactive == -1)	280	if (options->ip_qos_interactive == -1)
281	options->ip_qos_interactive = IPTOS_LOWDELAY;	281	options->ip_qos_interactive = IPTOS_DSCP_AF21;
282	if (options->ip_qos_bulk == -1)	282	if (options->ip_qos_bulk == -1)
283	options->ip_qos_bulk = IPTOS_THROUGHPUT;	283	options->ip_qos_bulk = IPTOS_DSCP_AF11;
284		284
285	/* Turn privilege separation on by default */	285	/* Turn privilege separation on by default */
286	if (use_privsep == -1)	286	if (use_privsep == -1)

Lines 45-47 Link Here

(-)ssh_config (+1 lines)
45	# PermitLocalCommand no	45	# PermitLocalCommand no
46	# VisualHostKey no	46	# VisualHostKey no
47	# ProxyCommand ssh -q -W %h:%p gateway.example.com	47	# ProxyCommand ssh -q -W %h:%p gateway.example.com
		48	# IPQoS AF21 AF11

Lines 662-670 If one argument is specified, it is used Link Here

(-)ssh_config.5 (-2 / +2 lines)
662	If two values are specified, the first is automatically selected for	662	If two values are specified, the first is automatically selected for
663	interactive sessions and the second for non-interactive sessions.	663	interactive sessions and the second for non-interactive sessions.
664	The default is	664	The default is
665	.Dq lowdelay	665	.Dq af21
666	for interactive sessions and	666	for interactive sessions and
667	.Dq throughput	667	.Dq af11
668	for non-interactive sessions.	668	for non-interactive sessions.
669	.It Cm KbdInteractiveAuthentication	669	.It Cm KbdInteractiveAuthentication
670	Specifies whether to use keyboard-interactive authentication.	670	Specifies whether to use keyboard-interactive authentication.

Lines 108-113 Link Here

(-)sshd_config (+3 lines)
108	# no default banner path	108	# no default banner path
109	#Banner none	109	#Banner none
110		110
		111	# operate in DSCP (RFC-4594) environment
		112	#IPQoS AF21 AF11
		113
111	# override default of no subsystems	114	# override default of no subsystems
112	Subsystem sftp /usr/libexec/sftp-server	115	Subsystem sftp /usr/libexec/sftp-server
113		116

Lines 545-553 If one argument is specified, it is used Link Here

(-)sshd_config.5 (-2 / +2 lines)
545	If two values are specified, the first is automatically selected for	545	If two values are specified, the first is automatically selected for
546	interactive sessions and the second for non-interactive sessions.	546	interactive sessions and the second for non-interactive sessions.
547	The default is	547	The default is
548	.Dq lowdelay	548	.Dq af21
549	for interactive sessions and	549	for interactive sessions and
550	.Dq throughput	550	.Dq af11
551	for non-interactive sessions.	551	for non-interactive sessions.
552	.It Cm KerberosAuthentication	552	.It Cm KerberosAuthentication
553	Specifies whether the password provided by the user for	553	Specifies whether the password provided by the user for

Return to bug 1856

Lines 950-963 static const struct { Link Here

(-)misc.c (-8 / +8 lines)
950	{ "af41", IPTOS_DSCP_AF41 },	950	{ "af41", IPTOS_DSCP_AF41 },
951	{ "af42", IPTOS_DSCP_AF42 },	951	{ "af42", IPTOS_DSCP_AF42 },
952	{ "af43", IPTOS_DSCP_AF43 },	952	{ "af43", IPTOS_DSCP_AF43 },
953	{ "cs0", IPTOS_DSCP_CS0 },	953	{ "cs0", IPTOS_CLASS_CS0 },
954	{ "cs1", IPTOS_DSCP_CS1 },	954	{ "cs1", IPTOS_CLASS_CS1 },
955	{ "cs2", IPTOS_DSCP_CS2 },	955	{ "cs2", IPTOS_CLASS_CS2 },
956	{ "cs3", IPTOS_DSCP_CS3 },	956	{ "cs3", IPTOS_CLASS_CS3 },
957	{ "cs4", IPTOS_DSCP_CS4 },	957	{ "cs4", IPTOS_CLASS_CS4 },
958	{ "cs5", IPTOS_DSCP_CS5 },	958	{ "cs5", IPTOS_CLASS_CS5 },
959	{ "cs6", IPTOS_DSCP_CS6 },	959	{ "cs6", IPTOS_CLASS_CS6 },
960	{ "cs7", IPTOS_DSCP_CS7 },	960	{ "cs7", IPTOS_CLASS_CS7 },
961	{ "ef", IPTOS_DSCP_EF },	961	{ "ef", IPTOS_DSCP_EF },
962	{ "lowdelay", IPTOS_LOWDELAY },	962	{ "lowdelay", IPTOS_LOWDELAY },
963	{ "throughput", IPTOS_THROUGHPUT },	963	{ "throughput", IPTOS_THROUGHPUT },

Lines 73-88 enum Link Here

(-)defines.h (-10 / +10 lines)
73	# define IPTOS_DSCP_AF43 0x98	73	# define IPTOS_DSCP_AF43 0x98
74	# define IPTOS_DSCP_EF 0xb8	74	# define IPTOS_DSCP_EF 0xb8
75	#endif /* IPTOS_DSCP_AF11 */	75	#endif /* IPTOS_DSCP_AF11 */
76	#ifndef IPTOS_DSCP_CS0	76	#ifndef IPTOS_CLASS_CS0
77	# define IPTOS_DSCP_CS0 0x00	77	# define IPTOS_CLASS_CS0 0x00
78	# define IPTOS_DSCP_CS1 0x20	78	# define IPTOS_CLASS_CS1 0x20
79	# define IPTOS_DSCP_CS2 0x40	79	# define IPTOS_CLASS_CS2 0x40
80	# define IPTOS_DSCP_CS3 0x60	80	# define IPTOS_CLASS_CS3 0x60
81	# define IPTOS_DSCP_CS4 0x80	81	# define IPTOS_CLASS_CS4 0x80
82	# define IPTOS_DSCP_CS5 0xa0	82	# define IPTOS_CLASS_CS5 0xa0
83	# define IPTOS_DSCP_CS6 0xc0	83	# define IPTOS_CLASS_CS6 0xc0
84	# define IPTOS_DSCP_CS7 0xe0	84	# define IPTOS_CLASS_CS7 0xe0
85	#endif /* IPTOS_DSCP_CS0 */	85	#endif /* IPTOS_CLASS_CS0 */
86	#ifndef IPTOS_DSCP_EF	86	#ifndef IPTOS_DSCP_EF
87	# define IPTOS_DSCP_EF 0xb8	87	# define IPTOS_DSCP_EF 0xb8
88	#endif /* IPTOS_DSCP_EF */	88	#endif /* IPTOS_DSCP_EF */