summaryrefslogtreecommitdiff
path: root/servconf.h
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2010-11-20 15:19:38 +1100
committerDamien Miller <djm@mindrot.org>2010-11-20 15:19:38 +1100
commit0dac6fb6b228a96f4ab3717e3d73871595a291a8 (patch)
tree7eae6f1e6a39fb7d608a05250f4749a77a914814 /servconf.h
parent4499f4cc20eee7e0f67b35f5a5c6078bf07dcbc0 (diff)
- djm@cvs.openbsd.org 2010/11/13 23:27:51
[clientloop.c misc.c misc.h packet.c packet.h readconf.c readconf.h] [servconf.c servconf.h session.c ssh.c ssh_config.5 sshd_config.5] allow ssh and sshd to set arbitrary TOS/DSCP/QoS values instead of hardcoding lowdelay/throughput. bz#1733 patch from philipp AT redfish-solutions.com; ok markus@ deraadt@
Diffstat (limited to 'servconf.h')
-rw-r--r--servconf.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/servconf.h b/servconf.h
index ad13f2edd..5a058a416 100644
--- a/servconf.h
+++ b/servconf.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: servconf.h,v 1.94 2010/09/22 05:01:29 djm Exp $ */ 1/* $OpenBSD: servconf.h,v 1.95 2010/11/13 23:27:50 djm Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -70,6 +70,8 @@ typedef struct {
70 char *xauth_location; /* Location of xauth program */ 70 char *xauth_location; /* Location of xauth program */
71 int strict_modes; /* If true, require string home dir modes. */ 71 int strict_modes; /* If true, require string home dir modes. */
72 int tcp_keep_alive; /* If true, set SO_KEEPALIVE. */ 72 int tcp_keep_alive; /* If true, set SO_KEEPALIVE. */
73 int ip_qos_interactive; /* IP ToS/DSCP/class for interactive */
74 int ip_qos_bulk; /* IP ToS/DSCP/class for bulk traffic */
73 char *ciphers; /* Supported SSH2 ciphers. */ 75 char *ciphers; /* Supported SSH2 ciphers. */
74 char *macs; /* Supported SSH2 macs. */ 76 char *macs; /* Supported SSH2 macs. */
75 char *kex_algorithms; /* SSH2 kex methods in order of preference. */ 77 char *kex_algorithms; /* SSH2 kex methods in order of preference. */